- wine-devel - winehq.org

[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

[PATCH v2 1/4] comctl32/taskdialog: Move TASKDIALOGCONFIG pointer in struct taskdialog_info.
by Zhiyi Zhang 18 May '18

18 May '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ef90efcc8d..6471eac203 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -84,8 +84,7 @@ struct taskdialog_template_desc struct taskdialog_info { HWND hwnd; - PFTASKDIALOGCALLBACK callback; - LONG_PTR callback_data; + const TASKDIALOGCONFIG *taskconfig; }; static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) @@ -520,8 +519,10 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notification, WPARAM wparam, LPARAM lparam) { - return dialog_info->callback ? dialog_info->callback(dialog_info->hwnd, notification, wparam, lparam, - dialog_info->callback_data) : S_OK; + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + return taskconfig->pfCallback + ? taskconfig->pfCallback(dialog_info->hwnd, notification, wparam, lparam, taskconfig->lpCallbackData) + : S_OK; } static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD command_id) @@ -590,8 +591,7 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *butto if (!taskconfig || taskconfig->cbSize != sizeof(TASKDIALOGCONFIG)) return E_INVALIDARG; - dialog_info.callback = taskconfig->pfCallback; - dialog_info.callback_data = taskconfig->lpCallbackData; + dialog_info.taskconfig = taskconfig; template = create_taskdialog_template(taskconfig); ret = (short)DialogBoxIndirectParamW(taskconfig->hInstance, template, taskconfig->hwndParent, -- 2.17.0

2 1

[PATCH] winevulkan: Trace unsupported instance extensions.
by Józef Kucia 18 May '18

18 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index ef9f09530246..53d7a119ab0c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -730,9 +730,10 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na { if (wine_vk_instance_extension_supported(host_properties[i].extensionName)) num_properties++; + else + TRACE("Instance extension '%s' is not supported.\n", host_properties[i].extensionName); } - /* We only have to count. */ if (!properties) { TRACE("Returning %u extensions\n", num_properties); -- 2.16.1

1 0

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

18 May '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 25 ++++++++++++++++++++++- dlls/comctl32/tests/taskdialog.c | 34 ++++++++++++++++++++++++++++++++ 2 files changed, 58 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..94fb25abb3 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -323,6 +323,39 @@ 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) +{ + int elapsed_ms; + int delta; + static int last_elapsed_ms = 0; + static int fired_count = 0; + if (notification == TDN_TIMER) + { + fired_count++; + elapsed_ms = (int)wParam; + delta = elapsed_ms - last_elapsed_ms; + ok(delta > 0, "Expect timer delta positive\n"); + last_elapsed_ms = elapsed_ms; + } + + if (fired_count == 2) SendMessageW(hwnd, TDM_CLICK_BUTTON, IDOK, 0); + + 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 +393,7 @@ START_TEST(taskdialog) test_callback(); test_buttons(); test_help(); + test_timer(); unload_v6_module(ctx_cookie, hCtx); } -- 2.17.0

2 1

[PATCH] kerberos: Silence a FIXME for the GSS_S_FAILURE case.
by Dmitry Timoshkov 18 May '18

18 May '18

In order to understand the source of GSS_S_FAILURE one needs to know GSS minor status code which could be translated only to text by GSS-API gss_display_status(), and knowing the text wouldn't change the returned error code anyway. A curious one (a developer) would need to generate a +kerberos log. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index d40ec04dd5..0ff6ae2738 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -710,6 +710,7 @@ static NTSTATUS status_gss_to_sspi( OM_uint32 status ) case GSS_S_OLD_TOKEN: return SEC_E_INVALID_TOKEN; case GSS_S_UNSEQ_TOKEN: return SEC_E_OUT_OF_SEQUENCE; case GSS_S_GAP_TOKEN: return SEC_E_OUT_OF_SEQUENCE; + case GSS_S_FAILURE: return SEC_E_INTERNAL_ERROR; default: FIXME( "couldn't convert status 0x%08x to NTSTATUS\n", status ); -- 2.16.3

2 1

[PATCH 1/5] msi/tests: Test deferral of CreateFolders and RemoveFolders.
by Zebediah Figura 18 May '18

18 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 14 ++++++++ dlls/msi/tests/custom.c | 87 ++++++++++++++++++++++++++++++++++++++++------ dlls/msi/tests/custom.spec | 2 ++ 4 files changed, 93 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 9c991d6..248439a 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version -custom_IMPORTS = uuid msi ole32 +custom_IMPORTS = uuid msi ole32 shell32 SOURCES = \ action.c \ diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 849975d..ae1b47b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -596,7 +596,11 @@ static const char cf_install_exec_seq_dat[] = "FileCost\t\t900\n" "RemoveFiles\t\t3500\n" "CreateFolders\t\t3700\n" + "cf_immediate\tNOT REMOVE\t3701\n" + "cf_deferred\tNOT REMOVE\t3702\n" "RemoveFolders\t\t3800\n" + "rf_immediate\tREMOVE\t3801\n" + "rf_deferred\tREMOVE\t3802\n" "InstallFiles\t\t4000\n" "RegisterUser\t\t6000\n" "RegisterProduct\t\t6100\n" @@ -609,6 +613,15 @@ static const char cf_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "LaunchConditions\t\t100\n"; +static const char cf_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "cf_immediate\t1\tcustom.dll\tcf_absent\n" + "cf_deferred\t1025\tcustom.dll\tcf_present\n" + "rf_immediate\t1\tcustom.dll\tcf_present\n" + "rf_deferred\t1025\tcustom.dll\tcf_absent\n"; + static const char sr_selfreg_dat[] = "File_\tCost\n" "s72\tI2\n" @@ -1771,6 +1784,7 @@ static const msi_table cf_tables[] = ADD_TABLE(cf_file), ADD_TABLE(cf_create_folders), ADD_TABLE(cf_install_exec_seq), + ADD_TABLE(cf_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index ff1be9b..aeee98e 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -24,10 +24,13 @@ #include <windef.h> #include <winbase.h> #define COBJMACROS +#include <shlobj.h> #include <msxml.h> #include <msi.h> #include <msiquery.h> +static int todo_level, todo_do_loop; + static void ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) { static char buffer[2000]; @@ -47,8 +50,30 @@ static void ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condi MsiProcessMessage(hinst, INSTALLMESSAGE_USER, record); MsiCloseHandle(record); } -#define ok(hinst, condition, ...) ok_(hinst, 0, __FILE__, __LINE__, condition, __VA_ARGS__) -#define todo_wine_ok(hinst, condition, ...) ok_(hinst, 1, __FILE__, __LINE__, condition, __VA_ARGS__) + +static void winetest_start_todo( int is_todo ) +{ + todo_level = (todo_level << 1) | (is_todo != 0); + todo_do_loop=1; +} + +static int winetest_loop_todo(void) +{ + int do_loop=todo_do_loop; + todo_do_loop=0; + return do_loop; +} + +static void winetest_end_todo(void) +{ + todo_level >>= 1; +} + +#define ok(hinst, condition, ...) ok_(hinst, todo_level, __FILE__, __LINE__, condition, __VA_ARGS__) +#define todo_wine_if(is_todo) for (winetest_start_todo(is_todo); \ + winetest_loop_todo(); \ + winetest_end_todo()) +#define todo_wine todo_wine_if(1) static const char *dbgstr_w(WCHAR *str) { @@ -886,7 +911,8 @@ static void test_costs(MSIHANDLE hinst) cost = 0xdead; r = MsiGetFeatureCostA(hinst, NULL, MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, &cost); ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); - todo_wine_ok(hinst, !cost, "got %d\n", cost); + todo_wine + ok(hinst, !cost, "got %d\n", cost); r = MsiGetFeatureCostA(hinst, "One", MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, NULL); ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); @@ -894,7 +920,8 @@ static void test_costs(MSIHANDLE hinst) cost = 0xdead; r = MsiGetFeatureCostA(hinst, "One", MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, &cost); ok(hinst, !r, "got %u\n", r); - todo_wine_ok(hinst, cost == 8, "got %d\n", cost); + todo_wine + ok(hinst, cost == 8, "got %d\n", cost); sz = cost = temp = 0xdead; r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, NULL, &sz, &cost, &temp); @@ -946,7 +973,8 @@ static void test_costs(MSIHANDLE hinst) r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + todo_wine + ok(hinst, sz == 4, "got size %u\n", sz); ok(hinst, cost == 8, "got cost %d\n", cost); ok(hinst, !temp, "got temp %d\n", temp); @@ -954,15 +982,19 @@ static void test_costs(MSIHANDLE hinst) strcpy(buffer,"x"); r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); - todo_wine_ok(hinst, !buffer[0], "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + todo_wine { + ok(hinst, !buffer[0], "got \"%s\"\n", buffer); + ok(hinst, sz == 4, "got size %u\n", sz); + } sz = 2; strcpy(buffer,"x"); r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); - todo_wine_ok(hinst, !strcmp(buffer, "C"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + todo_wine { + ok(hinst, !strcmp(buffer, "C"), "got \"%s\"\n", buffer); + ok(hinst, sz == 4, "got size %u\n", sz); + } sz = 3; strcpy(buffer,"x"); @@ -1021,7 +1053,8 @@ UINT WINAPI main_test(MSIHANDLE hinst) /* Test MsiGetDatabaseState() */ res = MsiGetDatabaseState(hinst); - todo_wine_ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); + todo_wine + ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); test_props(hinst); test_db(hinst); @@ -1101,7 +1134,8 @@ UINT WINAPI da_deferred(MSIHANDLE hinst) len = sizeof(prop); r = MsiGetPropertyA(hinst, "TESTPATH", prop, &len); ok(hinst, r == ERROR_SUCCESS, "got %u\n", r); - todo_wine_ok(hinst, !prop[0], "got %s\n", prop); + todo_wine + ok(hinst, !prop[0], "got %s\n", prop); /* Test modes */ ok(hinst, MsiGetMode(hinst, MSIRUNMODE_SCHEDULED), "should be scheduled\n"); @@ -1113,3 +1147,34 @@ UINT WINAPI da_deferred(MSIHANDLE hinst) return ERROR_SUCCESS; } + +static BOOL pf_exists(const char *file) +{ + char path[MAX_PATH]; + + if (FAILED(SHGetFolderPathA(NULL, CSIDL_PROGRAM_FILESX86, NULL, 0, path))) + SHGetFolderPathA(NULL, CSIDL_PROGRAM_FILES, NULL, 0, path); + strcat(path, "\\"); + strcat(path, file); + return GetFileAttributesA(path) != INVALID_FILE_ATTRIBUTES; +} + +UINT WINAPI cf_present(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, pf_exists("msitest\\first"), "folder absent\n"); + ok(hinst, pf_exists("msitest\\second"), "folder absent\n"); + ok(hinst, pf_exists("msitest\\third"), "folder absent\n"); +} + return ERROR_SUCCESS; +} + +UINT WINAPI cf_absent(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, !pf_exists("msitest\\first"), "folder present\n"); + ok(hinst, !pf_exists("msitest\\second"), "folder present\n"); + ok(hinst, !pf_exists("msitest\\third"), "folder present\n"); +} + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 51bb60e..cac0f85 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -3,3 +3,5 @@ @ stdcall da_immediate(long) @ stdcall da_deferred(long) @ stdcall nested(long) +@ stdcall cf_present(long) +@ stdcall cf_absent(long) -- 2.7.4

3 14

[PATCH v3] d3d11: Implement depth clip.
by Zebediah Figura 18 May '18

18 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/device.c | 2 -- dlls/d3d11/device.c | 3 --- dlls/d3d11/state.c | 1 + dlls/d3d11/tests/d3d11.c | 2 -- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/state.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 8 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4b39c1b..50521bd 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16894,12 +16894,10 @@ static void test_depth_clip(void) ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); draw_quad_z(&test_context, 2.0f); -todo_wine check_texture_float(texture, 0.6f, 1); draw_quad_z(&test_context, 0.5f); check_texture_float(texture, 0.5f, 1); draw_quad_z(&test_context, -1.0f); -todo_wine check_texture_float(texture, 0.4f, 1); ID3D10DepthStencilView_Release(dsv); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c930248..863f71f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -948,9 +948,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon const_bias.f = desc->DepthBias; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, const_bias.d); - /* GL_DEPTH_CLAMP */ - if (!desc->DepthClipEnable) - FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); wined3d_device_set_render_state(device->wined3d_device, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index f880a23..d4c3bef 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1068,6 +1068,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str } wined3d_desc.front_ccw = desc->FrontCounterClockwise; + wined3d_desc.depth_clip = desc->DepthClipEnable; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2a8ec0a..894c744 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27396,12 +27396,10 @@ static void test_depth_clip(void) ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); draw_quad_z(&test_context, 2.0f); -todo_wine check_texture_float(texture, 0.6f, 1); draw_quad_z(&test_context, 0.5f); check_texture_float(texture, 0.5f, 1); draw_quad_z(&test_context, -1.0f); -todo_wine check_texture_float(texture, 0.4f, 1); ID3D11DepthStencilView_Release(dsv); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 32c2552..a4e4a0c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -122,6 +122,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_cull_distance", ARB_CULL_DISTANCE }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, + {"GL_ARB_depth_clamp", ARB_DEPTH_CLAMP }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, {"GL_ARB_derivative_control", ARB_DERIVATIVE_CONTROL }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, @@ -3879,6 +3880,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, /* We don't need or want GL_ARB_texture_rectangle (core in 3.1). */ + {ARB_DEPTH_CLAMP, MAKEDWORD_VERSION(3, 2)}, {ARB_DRAW_ELEMENTS_BASE_VERTEX, MAKEDWORD_VERSION(3, 2)}, /* ARB_geometry_shader4 exposes a somewhat different API compared to 3.2 * core geometry shaders so it's not really correct to expose the diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 34e08e9..be34cb0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4329,6 +4329,24 @@ static void frontface(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + + if (gl_info->supported[ARB_DEPTH_CLAMP]) + { + if (state->rasterizer_state && !state->rasterizer_state->desc.depth_clip) + { + gl_info->gl_ops.gl.p_glEnable(GL_DEPTH_CLAMP); + checkGLcall("glEnable(GL_DEPTH_CLAMP)"); + } + else + { + gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_CLAMP); + checkGLcall("glDisable(GL_DEPTH_CLAMP)"); + } + } + else if (state->rasterizer_state && !state->rasterizer_state->desc.depth_clip) + { + WARN("Depth clip not supported by this GL implementation.\n"); + } } static void frontface_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4340,6 +4358,24 @@ static void frontface_cc(struct wined3d_context *context, const struct wined3d_s gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + + if (gl_info->supported[ARB_DEPTH_CLAMP]) + { + if (state->rasterizer_state && !state->rasterizer_state->desc.depth_clip) + { + gl_info->gl_ops.gl.p_glEnable(GL_DEPTH_CLAMP); + checkGLcall("glEnable(GL_DEPTH_CLAMP)"); + } + else + { + gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_CLAMP); + checkGLcall("glDisable(GL_DEPTH_CLAMP)"); + } + } + else if (state->rasterizer_state && !state->rasterizer_state->desc.depth_clip) + { + WARN("Depth clip not supported by this GL implementation.\n"); + } } static void psorigin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3140526..525c298 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -55,6 +55,7 @@ enum wined3d_gl_extension ARB_CULL_DISTANCE, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, + ARB_DEPTH_CLAMP, ARB_DEPTH_TEXTURE, ARB_DERIVATIVE_CONTROL, ARB_DRAW_BUFFERS, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 15e14e5..7681aa2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1986,6 +1986,7 @@ struct wined3d_blend_state_desc struct wined3d_rasterizer_state_desc { BOOL front_ccw; + BOOL depth_clip; }; struct wined3d_sampler_desc -- 2.7.4

1 0

[PATCH 2/2] ntdll: Return success for TokenIntegrityLevel in NtSetInformationToken.
by Alistair Leslie-Hughes 18 May '18

18 May '18

From: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/nt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 4ff9880..dc0ce04 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -638,6 +638,10 @@ NTSTATUS WINAPI NtSetInformationToken( FIXME("TokenSessionId stub!\n"); ret = STATUS_SUCCESS; break; + case TokenIntegrityLevel: + FIXME("TokenIntegrityLevel stub!\n"); + ret = STATUS_SUCCESS; + break; default: FIXME("unimplemented class %u\n", TokenInformationClass); break; -- 1.9.1

1 0

[PATCH 1/2] ntdll: Return success for TokenSessionId in NtSetInformationToken.
by Alistair Leslie-Hughes 18 May '18

18 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/nt.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c3f5df3..4ff9880 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -624,6 +624,20 @@ NTSTATUS WINAPI NtSetInformationToken( } SERVER_END_REQ; break; + case TokenSessionId: + if (TokenInformationLength < sizeof(DWORD)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + if (!TokenInformation) + { + ret = STATUS_ACCESS_VIOLATION; + break; + } + FIXME("TokenSessionId stub!\n"); + ret = STATUS_SUCCESS; + break; default: FIXME("unimplemented class %u\n", TokenInformationClass); break; -- 1.9.1

1 0

[PATCH v2] d3d11: Implement depth clip.
by Zebediah Figura 18 May '18

18 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/device.c | 2 -- dlls/d3d11/device.c | 3 --- dlls/d3d11/state.c | 1 + dlls/d3d11/tests/d3d11.c | 2 -- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/state.c | 11 +++++++++++ dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4b39c1b..50521bd 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16894,12 +16894,10 @@ static void test_depth_clip(void) ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); draw_quad_z(&test_context, 2.0f); -todo_wine check_texture_float(texture, 0.6f, 1); draw_quad_z(&test_context, 0.5f); check_texture_float(texture, 0.5f, 1); draw_quad_z(&test_context, -1.0f); -todo_wine check_texture_float(texture, 0.4f, 1); ID3D10DepthStencilView_Release(dsv); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c930248..863f71f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -948,9 +948,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon const_bias.f = desc->DepthBias; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, const_bias.d); - /* GL_DEPTH_CLAMP */ - if (!desc->DepthClipEnable) - FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); wined3d_device_set_render_state(device->wined3d_device, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index f880a23..d4c3bef 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1068,6 +1068,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str } wined3d_desc.front_ccw = desc->FrontCounterClockwise; + wined3d_desc.depth_clip = desc->DepthClipEnable; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2a8ec0a..894c744 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27396,12 +27396,10 @@ static void test_depth_clip(void) ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); draw_quad_z(&test_context, 2.0f); -todo_wine check_texture_float(texture, 0.6f, 1); draw_quad_z(&test_context, 0.5f); check_texture_float(texture, 0.5f, 1); draw_quad_z(&test_context, -1.0f); -todo_wine check_texture_float(texture, 0.4f, 1); ID3D11DepthStencilView_Release(dsv); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 32c2552..a4e4a0c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -122,6 +122,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_cull_distance", ARB_CULL_DISTANCE }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, + {"GL_ARB_depth_clamp", ARB_DEPTH_CLAMP }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, {"GL_ARB_derivative_control", ARB_DERIVATIVE_CONTROL }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, @@ -3879,6 +3880,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, /* We don't need or want GL_ARB_texture_rectangle (core in 3.1). */ + {ARB_DEPTH_CLAMP, MAKEDWORD_VERSION(3, 2)}, {ARB_DRAW_ELEMENTS_BASE_VERTEX, MAKEDWORD_VERSION(3, 2)}, /* ARB_geometry_shader4 exposes a somewhat different API compared to 3.2 * core geometry shaders so it's not really correct to expose the diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 34e08e9..875d49a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4329,6 +4329,17 @@ static void frontface(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + + if (state->rasterizer_state && !state->rasterizer_state->desc.depth_clip) + { + gl_info->gl_ops.gl.p_glEnable(GL_DEPTH_CLAMP); + checkGLcall("glEnable(GL_DEPTH_CLAMP)"); + } + else + { + gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_CLAMP); + checkGLcall("glDisable(GL_DEPTH_CLAMP)"); + } } static void frontface_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3140526..525c298 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -55,6 +55,7 @@ enum wined3d_gl_extension ARB_CULL_DISTANCE, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, + ARB_DEPTH_CLAMP, ARB_DEPTH_TEXTURE, ARB_DERIVATIVE_CONTROL, ARB_DRAW_BUFFERS, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 15e14e5..7681aa2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1986,6 +1986,7 @@ struct wined3d_blend_state_desc struct wined3d_rasterizer_state_desc { BOOL front_ccw; + BOOL depth_clip; }; struct wined3d_sampler_desc -- 2.7.4

1 0

[PATCH 2/2] winecfg: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 17 May '18

17 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/appdefaults.c | 18 +++++++-------- programs/winecfg/audio.c | 37 ++++++++++++++---------------- programs/winecfg/drive.c | 2 +- programs/winecfg/drivedetect.c | 3 +-- programs/winecfg/driveui.c | 12 ++++------ programs/winecfg/libraries.c | 4 ++-- programs/winecfg/theme.c | 51 +++++++++++++++++------------------------- programs/winecfg/winecfg.c | 10 ++++----- 8 files changed, 58 insertions(+), 79 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 61d515c707..e098c2b31a 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -174,8 +174,7 @@ init_comboboxes (HWND dialog) if (current_app) { WCHAR str[256]; - LoadStringW (GetModuleHandleW(NULL), IDS_USE_GLOBAL_SETTINGS, str, - sizeof(str)/sizeof(str[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_USE_GLOBAL_SETTINGS, str, ARRAY_SIZE(str)); SendDlgItemMessageW (dialog, IDC_WINVER, CB_ADDSTRING, 0, (LPARAM)str); } @@ -216,21 +215,20 @@ static void init_appsheet(HWND dialog) /* we use the lparam field of the item so we can alter the presentation later and not change code * for instance, to use the tile view or to display the EXEs embedded 'display name' */ - LoadStringW (GetModuleHandleW(NULL), IDS_DEFAULT_SETTINGS, appname, - sizeof(appname)/sizeof(appname[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_DEFAULT_SETTINGS, appname, ARRAY_SIZE(appname)); add_listview_item(listview, appname, NULL); /* because this list is only populated once, it's safe to bypass the settings list here */ if (RegOpenKeyA(config_key, "AppDefaults", &key) == ERROR_SUCCESS) { i = 0; - size = sizeof(appname)/sizeof(appname[0]); + size = ARRAY_SIZE(appname); while (RegEnumKeyExW (key, i, appname, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { add_listview_item(listview, appname, strdupW(appname)); i++; - size = sizeof(appname)/sizeof(appname[0]); + size = ARRAY_SIZE(appname); } RegCloseKey(key); @@ -331,19 +329,19 @@ static void on_add_app_click(HWND dialog) 0, 0, NULL, 0, NULL }; LoadStringW (GetModuleHandleW(NULL), IDS_SELECT_EXECUTABLE, selectExecutableStr, - sizeof(selectExecutableStr)/sizeof(selectExecutableStr[0])); + ARRAY_SIZE(selectExecutableStr)); LoadStringW (GetModuleHandleW(NULL), IDS_EXECUTABLE_FILTER, programsFilter, - sizeof(programsFilter)/sizeof(programsFilter[0])); + ARRAY_SIZE(programsFilter)); snprintfW( filter, MAX_PATH, filterW, programsFilter, 0, 0 ); ofn.lpstrTitle = selectExecutableStr; ofn.lpstrFilter = filter; ofn.lpstrFileTitle = filetitle; ofn.lpstrFileTitle[0] = '\0'; - ofn.nMaxFileTitle = sizeof(filetitle)/sizeof(filetitle[0]); + ofn.nMaxFileTitle = ARRAY_SIZE(filetitle); ofn.lpstrFile = file; ofn.lpstrFile[0] = '\0'; - ofn.nMaxFile = sizeof(file)/sizeof(file[0]); + ofn.nMaxFile = ARRAY_SIZE(file); if (GetOpenFileNameW (&ofn)) { diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 4b22f3d50d..1e5f69de24 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -232,12 +232,11 @@ static void initAudioDlg (HWND hDlg) WINE_TRACE("\n"); - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_DRIVER, - format_str, sizeof(format_str) / sizeof(*format_str)); - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_DRIVER_NONE, - disabled_str, sizeof(disabled_str) / sizeof(*disabled_str)); - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_SYSDEFAULT, - sysdefault_str, sizeof(sysdefault_str) / sizeof(*sysdefault_str)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_DRIVER, format_str, ARRAY_SIZE(format_str)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_DRIVER_NONE, disabled_str, + ARRAY_SIZE(disabled_str)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_SYSDEFAULT, sysdefault_str, + ARRAY_SIZE(sysdefault_str)); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&devenum); @@ -250,8 +249,7 @@ static void initAudioDlg (HWND hDlg) PropVariantInit(&pv); if(get_driver_name(devenum, &pv) && pv.u.pwszVal[0] != '\0'){ have_driver = TRUE; - wnsprintfW(display_str, sizeof(display_str) / sizeof(*display_str), - format_str, pv.u.pwszVal); + wnsprintfW(display_str, ARRAY_SIZE(display_str), format_str, pv.u.pwszVal); lstrcatW(g_drv_keyW, pv.u.pwszVal); } PropVariantClear(&pv); @@ -275,8 +273,8 @@ static void initAudioDlg (HWND hDlg) i = 0; while (speaker_configs[i].text_id != 0) { - LoadStringW(GetModuleHandleW(NULL), speaker_configs[i].text_id, - speaker_str, sizeof(speaker_str) / sizeof(*speaker_str)); + LoadStringW(GetModuleHandleW(NULL), speaker_configs[i].text_id, speaker_str, + ARRAY_SIZE(speaker_str)); SendDlgItemMessageW(hDlg, IDC_SPEAKERCONFIG_SPEAKERS, CB_ADDSTRING, 0, (LPARAM)speaker_str); @@ -287,14 +285,14 @@ static void initAudioDlg (HWND hDlg) GetClientRect(GetDlgItem(hDlg, IDC_LIST_AUDIO_DEVICES), &rect); width = (rect.right - rect.left) * 3 / 5; - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_DEVICE, colW, sizeof(colW)/sizeof(*colW)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_DEVICE, colW, ARRAY_SIZE(colW)); lvcol.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; lvcol.pszText = colW; lvcol.cchTextMax = lstrlenW(colW); lvcol.cx = width; SendDlgItemMessageW(hDlg, IDC_LIST_AUDIO_DEVICES, LVM_INSERTCOLUMNW, 0, (LPARAM)&lvcol); - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_SPEAKER_CONFIG, colW, sizeof(colW)/sizeof(*colW)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_SPEAKER_CONFIG, colW, ARRAY_SIZE(colW)); lvcol.pszText = colW; lvcol.cchTextMax = lstrlenW(colW); lvcol.cx = rect.right - rect.left - width; @@ -343,7 +341,7 @@ static void initAudioDlg (HWND hDlg) SendDlgItemMessageW(hDlg, IDC_LIST_AUDIO_DEVICES, LVM_INSERTITEMW, 0, (LPARAM)&lvitem); LoadStringW(GetModuleHandleW(NULL), speaker_configs[render_devs[i].speaker_config].text_id, - speaker_str, sizeof(speaker_str) / sizeof(*speaker_str)); + speaker_str, ARRAY_SIZE(speaker_str)); lvitem.mask = LVIF_TEXT; lvitem.iItem = i; @@ -378,8 +376,7 @@ static void initAudioDlg (HWND hDlg) HeapFree(GetProcessHeap(), 0, reg_in_dev); HeapFree(GetProcessHeap(), 0, reg_vin_dev); }else - wnsprintfW(display_str, sizeof(display_str) / sizeof(*display_str), - format_str, disabled_str); + wnsprintfW(display_str, ARRAY_SIZE(display_str), format_str, disabled_str); SetDlgItemTextW(hDlg, IDC_AUDIO_DRIVER, display_str); } @@ -405,10 +402,10 @@ static void test_sound(void) if(!PlaySoundW(MAKEINTRESOURCEW(IDW_TESTSOUND), NULL, SND_RESOURCE | SND_ASYNC)){ WCHAR error_str[256], title_str[256]; - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_TEST_FAILED, - error_str, sizeof(error_str) / sizeof(*error_str)); - LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_TEST_FAILED_TITLE, - title_str, sizeof(title_str) / sizeof(*title_str)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_TEST_FAILED, error_str, + ARRAY_SIZE(error_str)); + LoadStringW(GetModuleHandleW(NULL), IDS_AUDIO_TEST_FAILED_TITLE, title_str, + ARRAY_SIZE(title_str)); MessageBoxW(NULL, error_str, title_str, MB_OK | MB_ICONERROR); } @@ -527,7 +524,7 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) render_devs[dev].speaker_config = idx; LoadStringW(GetModuleHandleW(NULL), speaker_configs[idx].text_id, - speaker_str, sizeof(speaker_str) / sizeof(*speaker_str)); + speaker_str, ARRAY_SIZE(speaker_str)); lvitem.mask = LVIF_TEXT; lvitem.iItem = dev; diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index b5ef69d423..ecd0d9aff4 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -284,7 +284,7 @@ BOOL load_drives(void) if (data->mount_point_offset) unixpath = (char *)data + data->mount_point_offset; if (data->device_offset) device = (char *)data + data->device_offset; - if (!GetVolumeInformationW( root, volname, sizeof(volname)/sizeof(WCHAR), + if (!GetVolumeInformationW( root, volname, ARRAY_SIZE(volname), &serial, NULL, NULL, NULL, 0 )) { volname[0] = 0; diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 253c6296a9..d56512354f 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -291,8 +291,7 @@ static void ensure_drive_c_is_mapped(void) if (stat(drive_c_dir, &buf) == 0) { WCHAR label[64]; - LoadStringW (GetModuleHandleW(NULL), IDS_SYSTEM_DRIVE_LABEL, label, - sizeof(label)/sizeof(label[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_SYSTEM_DRIVE_LABEL, label, ARRAY_SIZE(label)); add_drive('C', "../drive_c", NULL, label, 0, DRIVE_FIXED); } else diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 98e057bd79..c25e71df52 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -340,8 +340,7 @@ static void on_add_click(HWND dialog) if (new == 'C') { WCHAR label[64]; - LoadStringW (GetModuleHandleW(NULL), IDS_SYSTEM_DRIVE_LABEL, label, - sizeof(label)/sizeof(label[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_SYSTEM_DRIVE_LABEL, label, ARRAY_SIZE(label)); add_drive(new, "../drive_c", NULL, label, 0, DRIVE_FIXED); } else add_drive(new, "/", NULL, NULL, 0, DRIVE_UNKNOWN); @@ -444,8 +443,7 @@ static void update_controls(HWND dialog) for (i = 0; i < sizeof(type_pairs) / sizeof(struct drive_typemap); i++) { WCHAR driveDesc[64]; - LoadStringW (GetModuleHandleW(NULL), type_pairs[i].idDesc, driveDesc, - sizeof(driveDesc)/sizeof(driveDesc[0])); + LoadStringW(GetModuleHandleW(NULL), type_pairs[i].idDesc, driveDesc, ARRAY_SIZE(driveDesc)); SendDlgItemMessageW (dialog, IDC_COMBO_TYPE, CB_ADDSTRING, 0, (LPARAM)driveDesc); if (type_pairs[i].sCode == type) @@ -633,8 +631,7 @@ static void init_listview_columns(HWND dialog) GetClientRect(GetDlgItem(dialog, IDC_LIST_DRIVES), &viewRect); width = (viewRect.right - viewRect.left) / 6 - 5; - LoadStringW (GetModuleHandleW(NULL), IDS_COL_DRIVELETTER, column, - sizeof(column)/sizeof(column[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_COL_DRIVELETTER, column, ARRAY_SIZE(column)); listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW (listColumn.pszText); @@ -642,8 +639,7 @@ static void init_listview_columns(HWND dialog) SendDlgItemMessageW (dialog, IDC_LIST_DRIVES, LVM_INSERTCOLUMNW, 0, (LPARAM) &listColumn); - LoadStringW (GetModuleHandleW(NULL), IDS_COL_DRIVEMAPPING, column, - sizeof(column)/sizeof(column[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_COL_DRIVEMAPPING, column, ARRAY_SIZE(column)); listColumn.cx = viewRect.right - viewRect.left - width; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW (listColumn.pszText); diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index d414c75a2f..22e9435e32 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -208,7 +208,7 @@ static inline BOOL is_builtin_only( const char *name ) !strcmp( ext, ".tlb" )) return TRUE; } - return bsearch( &name, builtin_only, sizeof(builtin_only)/sizeof(builtin_only[0]), + return bsearch( &name, builtin_only, ARRAY_SIZE(builtin_only), sizeof(builtin_only[0]), compare_dll ) != NULL; } @@ -414,7 +414,7 @@ static void on_add_combo_change(HWND dialog) WCHAR buffer[1024]; int sel, len; - SendDlgItemMessageW(dialog, IDC_DLLCOMBO, WM_GETTEXT, sizeof(buffer)/sizeof(WCHAR), (LPARAM) buffer); + SendDlgItemMessageW(dialog, IDC_DLLCOMBO, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); /* if lib was chosen from combobox, we receive an empty buffer, check manually */ sel=SendDlgItemMessageW(dialog, IDC_DLLCOMBO, CB_GETCURSEL, 0, 0); len=SendDlgItemMessageW(dialog, IDC_DLLCOMBO, CB_GETLBTEXTLEN, sel, 0); diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 1d915bcaad..f98dcc3ae7 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -299,8 +299,7 @@ static BOOL fill_theme_list (HWND comboTheme, HWND comboColor, HWND comboSize) WCHAR currentSize[MAX_PATH]; ThemeFile* theme = NULL; - LoadStringW (GetModuleHandleW(NULL), IDS_NOTHEME, textNoTheme, - sizeof(textNoTheme) / sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), IDS_NOTHEME, textNoTheme, ARRAY_SIZE(textNoTheme)); SendMessageW (comboTheme, CB_RESETCONTENT, 0, 0); SendMessageW (comboTheme, CB_ADDSTRING, 0, (LPARAM)textNoTheme); @@ -311,11 +310,9 @@ static BOOL fill_theme_list (HWND comboTheme, HWND comboColor, HWND comboSize) SendMessageW (comboTheme, CB_ADDSTRING, 0, (LPARAM)item->fancyName); } - - if (IsThemeActive () && SUCCEEDED (GetCurrentThemeName (currentTheme, - sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentColor) / sizeof(WCHAR), - currentSize, sizeof(currentSize) / sizeof(WCHAR)))) + + if (IsThemeActive() && SUCCEEDED(GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), + currentColor, ARRAY_SIZE(currentColor), currentSize, ARRAY_SIZE(currentSize)))) { /* Determine the index of the currently active theme. */ BOOL found = FALSE; @@ -371,11 +368,9 @@ static BOOL update_color_and_size (int themeIndex, HWND comboColor, ThemeFile* theme = DSA_GetItemPtr (themeFiles, themeIndex - 1); fill_color_size_combos (theme, comboColor, comboSize); - - if ((SUCCEEDED (GetCurrentThemeName (currentTheme, - sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentColor) / sizeof(WCHAR), - currentSize, sizeof(currentSize) / sizeof(WCHAR)))) + + if ((SUCCEEDED(GetCurrentThemeName (currentTheme, ARRAY_SIZE(currentTheme), + currentColor, ARRAY_SIZE(currentColor), currentSize, ARRAY_SIZE(currentSize)))) && (lstrcmpiW (currentTheme, theme->themeFileName) == 0)) { select_color_and_size (theme, currentColor, comboColor, @@ -560,7 +555,7 @@ static void set_color_from_theme(WCHAR *keyName, COLORREF color) keyNameA = HeapAlloc(GetProcessHeap(), 0, keyNameSize); WideCharToMultiByte(CP_ACP, 0, keyName, -1, keyNameA, keyNameSize, NULL, NULL); - for (i=0; i<sizeof(metrics)/sizeof(metrics[0]); i++) + for (i=0; i < ARRAY_SIZE(metrics); i++) { if (lstrcmpiA(metrics[i].color_reg, keyNameA)==0) { @@ -620,19 +615,16 @@ static void on_theme_install(HWND dialog) static const WCHAR filterMask[] = {0,'*','.','m','s','s','t','y','l','e','s',';', '*','.','t','h','e','m','e',0,0}; static const WCHAR themeExt[] = {'.','T','h','e','m','e',0}; - const int filterMaskLen = sizeof(filterMask)/sizeof(filterMask[0]); + const int filterMaskLen = ARRAY_SIZE(filterMask); OPENFILENAMEW ofn; WCHAR filetitle[MAX_PATH]; WCHAR file[MAX_PATH]; WCHAR filter[100]; WCHAR title[100]; - LoadStringW (GetModuleHandleW(NULL), IDS_THEMEFILE, - filter, sizeof (filter) / sizeof (filter[0]) - filterMaskLen); - memcpy (filter + lstrlenW (filter), filterMask, - filterMaskLen * sizeof (WCHAR)); - LoadStringW (GetModuleHandleW(NULL), IDS_THEMEFILE_SELECT, - title, sizeof (title) / sizeof (title[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_THEMEFILE, filter, ARRAY_SIZE(filter) - filterMaskLen); + memcpy(filter + lstrlenW (filter), filterMask, filterMaskLen * sizeof (WCHAR)); + LoadStringW(GetModuleHandleW(NULL), IDS_THEMEFILE_SELECT, title, ARRAY_SIZE(title)); ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.hwndOwner = dialog; @@ -646,7 +638,7 @@ static void on_theme_install(HWND dialog) ofn.nMaxFile = sizeof(file)/sizeof(filetitle[0]); ofn.lpstrFileTitle = filetitle; ofn.lpstrFileTitle[0] = '\0'; - ofn.nMaxFileTitle = sizeof(filetitle)/sizeof(filetitle[0]); + ofn.nMaxFileTitle = ARRAY_SIZE(filetitle); ofn.lpstrInitialDir = NULL; ofn.lpstrTitle = title; ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLESIZING; @@ -746,8 +738,8 @@ static void init_shell_folder_listview_headers(HWND dialog) { WCHAR szLinksTo[64] = {'L','i','n','k','s',' ','t','o',0}; int width; - LoadStringW(GetModuleHandleW(NULL), IDS_SHELL_FOLDER, szShellFolder, sizeof(szShellFolder)/sizeof(WCHAR)); - LoadStringW(GetModuleHandleW(NULL), IDS_LINKS_TO, szLinksTo, sizeof(szLinksTo)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), IDS_SHELL_FOLDER, szShellFolder, ARRAY_SIZE(szShellFolder)); + LoadStringW(GetModuleHandleW(NULL), IDS_LINKS_TO, szLinksTo, ARRAY_SIZE(szLinksTo)); GetClientRect(GetDlgItem(dialog, IDC_LIST_SFPATHS), &viewRect); width = (viewRect.right - viewRect.left) / 3; @@ -965,7 +957,7 @@ static void refresh_sysparams(HWND hDlg) { int i; - for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++) + for (i = 0; i < ARRAY_SIZE(metrics); i++) { if (metrics[i].sm_idx != -1) metrics[i].size = GetSystemMetrics(metrics[i].sm_idx); @@ -983,10 +975,9 @@ static void read_sysparams(HWND hDlg) NONCLIENTMETRICSW nonclient_metrics; int i, idx; - for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++) + for (i = 0; i < ARRAY_SIZE(metrics); i++) { - LoadStringW(GetModuleHandleW(NULL), i + IDC_SYSPARAMS_BUTTON, buffer, - sizeof(buffer) / sizeof(buffer[0])); + LoadStringW(GetModuleHandleW(NULL), i + IDC_SYSPARAMS_BUTTON, buffer, ARRAY_SIZE(buffer)); idx = SendMessageW(list, CB_ADDSTRING, 0, (LPARAM)buffer); if (idx != CB_ERR) SendMessageW(list, CB_SETITEMDATA, idx, i); @@ -1013,8 +1004,8 @@ static void apply_sysparams(void) { NONCLIENTMETRICSW ncm; int i, cnt = 0; - int colors_idx[sizeof(metrics) / sizeof(metrics[0])]; - COLORREF colors[sizeof(metrics) / sizeof(metrics[0])]; + int colors_idx[ARRAY_SIZE(metrics)]; + COLORREF colors[ARRAY_SIZE(metrics)]; HDC hdc; int dpi; @@ -1049,7 +1040,7 @@ static void apply_sysparams(void) SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(ncm), &ncm, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); - for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++) + for (i = 0; i < ARRAY_SIZE(metrics); i++) if (metrics[i].color_idx != -1) { colors_idx[cnt] = metrics[i].color_idx; diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index ba317c7755..be04ba2a77 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -62,14 +62,12 @@ void set_window_title(HWND dialog) if (current_app) { WCHAR apptitle[256]; - LoadStringW (GetModuleHandleW(NULL), IDS_WINECFG_TITLE_APP, apptitle, - sizeof(apptitle)/sizeof(apptitle[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_WINECFG_TITLE_APP, apptitle, ARRAY_SIZE(apptitle)); wsprintfW (newtitle, apptitle, current_app); } else { - LoadStringW (GetModuleHandleW(NULL), IDS_WINECFG_TITLE, newtitle, - sizeof(newtitle)/sizeof(newtitle[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_WINECFG_TITLE, newtitle, ARRAY_SIZE(newtitle)); } WINE_TRACE("setting title to %s\n", wine_dbgstr_w (newtitle)); @@ -83,7 +81,7 @@ WCHAR* load_string (UINT id) int len; WCHAR* newStr; - LoadStringW (GetModuleHandleW(NULL), id, buf, sizeof(buf)/sizeof(buf[0])); + LoadStringW(GetModuleHandleW(NULL), id, buf, ARRAY_SIZE(buf)); len = lstrlenW (buf); newStr = HeapAlloc (GetProcessHeap(), 0, (len + 1) * sizeof (WCHAR)); @@ -477,7 +475,7 @@ static WCHAR **enumerate_valuesW(HKEY root, WCHAR *path) while (TRUE) { WCHAR name[1024]; - DWORD namesize = sizeof(name)/sizeof(name[0]); + DWORD namesize = ARRAY_SIZE(name); BOOL removed = FALSE; /* find out the needed size, allocate a buffer, read the value */ -- 2.14.3

1 0

[PATCH 1/2] winecfg: Remove an ARRAY_SIZE() alike macro
by Michael Stefaniuc 17 May '18

17 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/appdefaults.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index a08542a2c9..61d515c707 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -72,8 +72,6 @@ static const struct #endif }; -#define NB_VERSIONS (sizeof(win_versions)/sizeof(win_versions[0])) - static const char szKey9x[] = "Software\\Microsoft\\Windows\\CurrentVersion"; static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion"; static const char szKeyProdNT[] = "System\\CurrentControlSet\\Control\\ProductOptions"; @@ -113,7 +111,7 @@ static int get_registry_version(void) } major = atoi(ver); - for (i = 0; i < NB_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(win_versions); i++) { if (win_versions[i].dwPlatformId != platform) continue; if (win_versions[i].dwMajorVersion != major) continue; @@ -151,7 +149,7 @@ static void update_comboboxes(HWND dialog) WINE_TRACE("winver is %s\n", winver); /* normalize the version strings */ - for (i = 0; i < NB_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(win_versions); i++) { if (!strcasecmp (win_versions[i].szVersion, winver)) { @@ -181,7 +179,7 @@ init_comboboxes (HWND dialog) SendDlgItemMessageW (dialog, IDC_WINVER, CB_ADDSTRING, 0, (LPARAM)str); } - for (i = 0; i < NB_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(win_versions); i++) { SendDlgItemMessageA(dialog, IDC_WINVER, CB_ADDSTRING, 0, (LPARAM) win_versions[i].szDescription); -- 2.14.3

1 0

Call for WineConf presentations
by Aric Stewart 17 May '18

17 May '18

Hello, As discussed during WineConf 2017, I am helping coordinate the talks and presentations this year. In previous years we have been very last minute and laid back in the proposal and scheduling of presentations. While this has it's advantages I have volunteered to help call for and organize presentations further in advance so speakers have some time to prepare the presentation they wish to give. General Guidelines: * Please provide an estimate of how long your talk will be. We are shooting for approximate 40 minute slots with between 15-20 minutes of talk and with likely an equal amount of question and discussion time afterward. Generally shorter talks are not an issue, however longer talks will need to be discussed and will be considered based on the rest of the schedule. * Topics should obviously be of interest to the other attendees, i.e., the broader Wine community, but note that that doesn't imply the talk has to be about Wine itself * If you have a preferred time and date for your talk please indicate that to me when you submit your talk. We will try to make it work as best we can. Here are the rough proposed slots, They will be changed and modified as required by the addenda as it gets fleshed out. Understand that even with this shift toward a scheduled day we will not disrupt productive conversation to fit to the schedule. The schedule will warp and flow as required to facilitate the talk, not force the talks to conform to it. This does mean if you are planing to try to attend a given talk you will likely want to arrive a bit early and understand if when you arrive the schedule is either behind or ahead of plan. Daily Slots: 09:00 - 09:40 slot 1 09:45 - 10:25 slot 2 10:30 - 11:00 break 11:00 - 11:40 slot 3 12:00 - 13:00 lunch break 13:00 - 13:40 slot 4 13:45 - 14:25 slot 5 14:30 - 15:00 break 15:00 - 15:40 slot 6 15:45 - 16:25 slot 7 16:25 - 17:00 Overflow time / small group discussion / short presentations We will track proposed presentations on the WineConf Wiki: https://wiki.winehq.org/WineConf2018 If this more organized presentation proposal process works well, we may try to expand it to include scheduling times in the near future. But for this year getting a working itinerary and scheduling the talks during the opening of the conference is likely acceptable. However if you have a preference toward Saturday or Sunday please express that. If you would like to give a presentation! Please e-mail me directly! I will keep the Wiki updated with presentations and scheduling as we get it worked out. If you would like to see a given presentation, reach out on the mailing list, see if you can get the people qualified to give the presentation to step up and contact me! Likely we will have open time at the conference which we will propose presentations and fill at the time. We have never had a problem finding things we all want to talk about. thanks! -aric

10 16

[PATCH v2 Wine Translations] Update Korean translations
by 김건우 17 May '18

17 May '18

1 1

[PATCH 2/7] comctl32/taskdialog: Use dynamic resizing.
by Zhiyi Zhang 17 May '18

17 May '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 476 +++++++++++++++++++++---------------- 1 file changed, 268 insertions(+), 208 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 1ab9e133da..4fdea1e889 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -2,6 +2,7 @@ * Task dialog control * * Copyright 2017 Fabian Maurer + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -71,37 +72,23 @@ struct taskdialog_button_desc struct taskdialog_template_desc { const TASKDIALOGCONFIG *taskconfig; - unsigned int dialog_height; - unsigned int dialog_width; struct list controls; WORD control_count; - LONG x_baseunit; - LONG y_baseunit; - HFONT font; - struct taskdialog_button_desc *default_button; }; struct taskdialog_info { HWND hwnd; - PFTASKDIALOGCALLBACK callback; - LONG_PTR callback_data; + const TASKDIALOGCONFIG *taskconfig; + LONG x_baseunit; + LONG y_baseunit; + HFONT hfont; }; -static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) +static void dialogunits_to_pixels(const struct taskdialog_info *dialog_info, LONG *width, LONG *height) { - if (width) - *width = MulDiv(*width, 4, desc->x_baseunit); - if (height) - *height = MulDiv(*height, 8, desc->y_baseunit); -} - -static void dialogunits_to_pixels(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) -{ - if (width) - *width = MulDiv(*width, desc->x_baseunit, 4); - if (height) - *height = MulDiv(*height, desc->y_baseunit, 8); + if (width) *width = MulDiv(*width, dialog_info->x_baseunit, 4); + if (height) *height = MulDiv(*height, dialog_info->y_baseunit, 8); } static void template_write_data(char **ptr, const void *src, unsigned int size) @@ -110,66 +97,54 @@ static void template_write_data(char **ptr, const void *src, unsigned int size) *ptr += size; } -/* used to calculate size for the controls */ -static void taskdialog_get_text_extent(const struct taskdialog_template_desc *desc, const WCHAR *text, - BOOL user_resource, SIZE *sz) +static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notification, WPARAM wparam, LPARAM lparam) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + return taskconfig->pfCallback + ? taskconfig->pfCallback(dialog_info->hwnd, notification, wparam, lparam, taskconfig->lpCallbackData) + : S_OK; +} + +const WCHAR *taskdialog_loadstring(const WCHAR *text, BOOL user_resource, HINSTANCE hinstance, LONG *length) { - RECT rect = { 0, 0, desc->dialog_width - DIALOG_SPACING * 2, 0}; /* padding left and right of the control */ - const WCHAR *textW = NULL; static const WCHAR nulW; - unsigned int length; - HFONT oldfont; - HDC hdc; + const WCHAR *textW = NULL; if (IS_INTRESOURCE(text)) { - if (!(length = LoadStringW(user_resource ? desc->taskconfig->hInstance : COMCTL32_hModule, - (UINT_PTR)text, (WCHAR *)&textW, 0))) + if (!(*length = LoadStringW(user_resource ? hinstance : COMCTL32_hModule, (UINT_PTR)text, (WCHAR *)&textW, 0))) { WARN("Failed to load text\n"); textW = &nulW; - length = 0; + *length = 0; } } else { textW = text; - length = strlenW(textW); + *length = strlenW(textW); } - hdc = GetDC(0); - oldfont = SelectObject(hdc, desc->font); - - dialogunits_to_pixels(desc, &rect.right, NULL); - DrawTextW(hdc, textW, length, &rect, DT_LEFT | DT_EXPANDTABS | DT_CALCRECT | DT_WORDBREAK); - pixels_to_dialogunits(desc, &rect.right, &rect.bottom); - - SelectObject(hdc, oldfont); - ReleaseDC(0, hdc); - - sz->cx = rect.right - rect.left; - sz->cy = rect.bottom - rect.top; + return textW; } static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc, WORD id, const WCHAR *class, - HINSTANCE hInstance, const WCHAR *text, DWORD style, short x, short y, short cx, short cy) + HINSTANCE hInstance, const WCHAR *text, DWORD style) { struct taskdialog_control *control = Alloc(sizeof(*control)); unsigned int size, class_size, text_size; DLGITEMTEMPLATE *template; static const WCHAR nulW; const WCHAR *textW; + LONG length; char *ptr; class_size = (strlenW(class) + 1) * sizeof(WCHAR); - if (IS_INTRESOURCE(text)) - text_size = LoadStringW(hInstance, (UINT_PTR)text, (WCHAR *)&textW, 0) * sizeof(WCHAR); - else - { - textW = text; - text_size = strlenW(textW) * sizeof(WCHAR); - } + if (!text) text = &nulW; + + textW = taskdialog_loadstring(text, TRUE, hInstance, &length); + text_size = length * sizeof(WCHAR); size = sizeof(DLGITEMTEMPLATE); size += class_size; @@ -180,11 +155,6 @@ static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc control->template_size = size; template->style = WS_VISIBLE | style; - template->dwExtendedStyle = 0; - template->x = x; - template->y = y; - template->cx = cx; - template->cy = cy; template->id = id; ptr = (char *)(template + 1); template_write_data(&ptr, class, class_size); @@ -198,19 +168,8 @@ static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc static unsigned int taskdialog_add_static_label(struct taskdialog_template_desc *desc, WORD id, const WCHAR *str) { - unsigned int size; - SIZE sz; - - if (!str) - return 0; - - taskdialog_get_text_extent(desc, str, TRUE, &sz); - - desc->dialog_height += DIALOG_SPACING; - size = taskdialog_add_control(desc, id, WC_STATICW, desc->taskconfig->hInstance, str, 0, DIALOG_SPACING, - desc->dialog_height, sz.cx, sz.cy); - desc->dialog_height += sz.cy + DIALOG_SPACING; - return size; + if (!str) return 0; + return taskdialog_add_control(desc, id, WC_STATICW, desc->taskconfig->hInstance, str, 0); } static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_desc *desc) @@ -223,97 +182,214 @@ static unsigned int taskdialog_add_content(struct taskdialog_template_desc *desc return taskdialog_add_static_label(desc, ID_CONTENT, desc->taskconfig->pszContent); } -static void taskdialog_init_button(struct taskdialog_button_desc *button, struct taskdialog_template_desc *desc, - int id, const WCHAR *text, BOOL custom_button) +static unsigned int taskdialog_add_buttons(struct taskdialog_template_desc *desc) { - SIZE sz; - - taskdialog_get_text_extent(desc, text, custom_button, &sz); + const TASKDIALOGCONFIG *taskconfig = desc->taskconfig; + DWORD style, flags = taskconfig->dwCommonButtons; + struct taskdialog_button_desc *buttons; + unsigned int max_count, count = 0, i, size = 0; + int default_id = 0; - button->id = id; - button->text = text; - button->width = max(DIALOG_BUTTON_WIDTH, sz.cx + DIALOG_SPACING * 2); - button->line = 0; - button->hinst = custom_button ? desc->taskconfig->hInstance : COMCTL32_hModule; + /* Allocate enough memory for the custom and the default buttons. Maximum 6 + * default buttons possible. */ + max_count = 6; - if (id == desc->taskconfig->nDefaultButton) - desc->default_button = button; -} + if (taskconfig->cButtons && taskconfig->pButtons) max_count += taskconfig->cButtons; -static void taskdialog_init_common_buttons(struct taskdialog_template_desc *desc, struct taskdialog_button_desc *buttons, - unsigned int *button_count) -{ - DWORD flags = desc->taskconfig->dwCommonButtons; + buttons = Alloc(max_count * sizeof(*buttons)); + if (!buttons) return 0; -#define TASKDIALOG_INIT_COMMON_BUTTON(id) \ - do { \ - taskdialog_init_button(&buttons[(*button_count)++], desc, ID##id, MAKEINTRESOURCEW(IDS_BUTTON_##id), FALSE); \ - } while(0) + if (taskconfig->cButtons && taskconfig->pButtons) + for (count = 0; count < taskconfig->cButtons; count++) + { + buttons[count].id = taskconfig->pButtons[count].nButtonID; + buttons[count].text = taskconfig->pButtons[count].pszButtonText; + buttons[count].hinst = taskconfig->hInstance; + } - if (flags & TDCBF_OK_BUTTON) - TASKDIALOG_INIT_COMMON_BUTTON(OK); + if (flags & TDCBF_OK_BUTTON + || (count == 0 && !(flags & (TDCBF_YES_BUTTON | TDCBF_NO_BUTTON | TDCBF_RETRY_BUTTON | TDCBF_CANCEL_BUTTON | TDCBF_CLOSE_BUTTON)))) + { + buttons[count].id = IDOK; + buttons[count++].text = MAKEINTRESOURCEW(IDS_BUTTON_OK); + } if (flags & TDCBF_YES_BUTTON) - TASKDIALOG_INIT_COMMON_BUTTON(YES); + { + buttons[count].id = IDYES; + buttons[count++].text = MAKEINTRESOURCEW(IDS_BUTTON_YES); + } if (flags & TDCBF_NO_BUTTON) - TASKDIALOG_INIT_COMMON_BUTTON(NO); + { + buttons[count].id = IDNO; + buttons[count++].text = MAKEINTRESOURCEW(IDS_BUTTON_NO); + } if (flags & TDCBF_RETRY_BUTTON) - TASKDIALOG_INIT_COMMON_BUTTON(RETRY); + { + buttons[count].id = IDRETRY; + buttons[count++].text = MAKEINTRESOURCEW(IDS_BUTTON_RETRY); + } if (flags & TDCBF_CANCEL_BUTTON) - TASKDIALOG_INIT_COMMON_BUTTON(CANCEL); + { + buttons[count].id = IDCANCEL; + buttons[count++].text = MAKEINTRESOURCEW(IDS_BUTTON_CANCEL); + } if (flags & TDCBF_CLOSE_BUTTON) - TASKDIALOG_INIT_COMMON_BUTTON(CLOSE); + { + buttons[count].id = IDCLOSE; + buttons[count++].text = MAKEINTRESOURCEW(IDS_BUTTON_CLOSE); + } + + for (i = 0; i < count; i++) + if (buttons[i].id == taskconfig->nDefaultButton) default_id = buttons[i].id; + + if (!default_id) default_id = buttons[0].id; + + for (i = 0; i < count; i++) + { + style = buttons[i].id == default_id ? BS_DEFPUSHBUTTON : BS_PUSHBUTTON; + size += taskdialog_add_control(desc, buttons[i].id, WC_BUTTONW, + buttons[i].hinst ? buttons[i].hinst : COMCTL32_hModule, buttons[i].text, style); + } -#undef TASKDIALOG_INIT_COMMON_BUTTON + Free(buttons); + return size; } -static unsigned int taskdialog_add_buttons(struct taskdialog_template_desc *desc) +static unsigned int taskdialog_get_reference_rect(struct taskdialog_info *dialog_info, RECT *ret) { - unsigned int count = 0, buttons_size, i, line_count, size = 0; - unsigned int location_x, *line_widths, alignment = ~0u; - const TASKDIALOGCONFIG *taskconfig = desc->taskconfig; + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + HMONITOR monitor = MonitorFromWindow(taskconfig->hwndParent ? taskconfig->hwndParent : GetActiveWindow(), + MONITOR_DEFAULTTOPRIMARY); + MONITORINFO info; + + info.cbSize = sizeof(info); + GetMonitorInfoW(monitor, &info); + + if (taskconfig->dwFlags & TDF_POSITION_RELATIVE_TO_WINDOW && taskconfig->hwndParent) + GetWindowRect(taskconfig->hwndParent, ret); + else + *ret = info.rcWork; + + return info.rcWork.right - info.rcWork.left; +} + +static void taskdialog_get_label_size(HWND hwnd, LONG max_width, SIZE *size) +{ + HFONT hfont, old_hfont; + HDC hdc; + RECT rect = {0}; + WCHAR text[1024]; + INT text_length; + + hfont = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + text_length = GetWindowTextW(hwnd, text, ARRAY_SIZE(text)); + hdc = GetDC(hwnd); + old_hfont = SelectObject(hdc, hfont); + rect.right = max_width; + size->cy = DrawTextW(hdc, text, text_length, &rect, DT_LEFT | DT_EXPANDTABS | DT_CALCRECT | DT_WORDBREAK); + size->cx = min(max_width, rect.right - rect.left); + if(old_hfont) SelectObject(hdc, old_hfont); + ReleaseDC(hwnd, hdc); +} + +static void taskdialog_resize(struct taskdialog_info *dialog_info) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + static BOOL first_time = TRUE; + RECT ref_rect, window_rect; + LONG screen_width; + LONG dialog_width, dialog_height = 0; + LONG x, y; + SIZE size; + LONG horizontal_spacing, vertical_spacing; + HWND hwnd; + DWORD flags = taskconfig->dwCommonButtons; + LONG buttons_max_size, button_min_width, button_count = 0, line_count; + LONG *line_widths, alignment; struct taskdialog_button_desc *buttons; + INT i; - /* Allocate enough memory for the custom and the default buttons. Maximum 6 default buttons possible. */ - buttons_size = 6; - if (taskconfig->cButtons && taskconfig->pButtons) - buttons_size += taskconfig->cButtons; + screen_width = taskdialog_get_reference_rect(dialog_info, &ref_rect); - if (!(buttons = Alloc(buttons_size * sizeof(*buttons)))) - return 0; + dialog_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH); + dialogunits_to_pixels(dialog_info, &dialog_width, 0); + dialog_width = min(dialog_width, screen_width); - /* Custom buttons */ - if (taskconfig->cButtons && taskconfig->pButtons) - for (i = 0; i < taskconfig->cButtons; i++) - taskdialog_init_button(&buttons[count++], desc, taskconfig->pButtons[i].nButtonID, - taskconfig->pButtons[i].pszButtonText, TRUE); + horizontal_spacing = DIALOG_SPACING; + vertical_spacing = DIALOG_SPACING; - /* Common buttons */ - taskdialog_init_common_buttons(desc, buttons, &count); + dialogunits_to_pixels(dialog_info, &horizontal_spacing, &vertical_spacing); - /* There must be at least one button */ - if (count == 0) - taskdialog_init_button(&buttons[count++], desc, IDOK, MAKEINTRESOURCEW(IDS_BUTTON_OK), FALSE); + /* Main instruction */ + hwnd = GetDlgItem(dialog_info->hwnd, ID_MAIN_INSTRUCTION); + if (hwnd) + { + x = horizontal_spacing; + y = dialog_height + vertical_spacing; + size.cx = dialog_width - x - horizontal_spacing; + taskdialog_get_label_size(hwnd, size.cx, &size); + MoveWindow(hwnd, x, y, size.cx, size.cy, TRUE); + dialog_height = y + size.cy; + } + + /* Main content */ + hwnd = GetDlgItem(dialog_info->hwnd, ID_CONTENT); + if (hwnd) + { + x = horizontal_spacing; + y = dialog_height + vertical_spacing; + size.cx = dialog_width - x - horizontal_spacing; + taskdialog_get_label_size(hwnd, size.cx, &size); + MoveWindow(hwnd, x, y, size.cx, size.cy, TRUE); + dialog_height = y + size.cy; + } + + /* Common Buttons and Custom Buttons */ + /* Allocate enough memory for the custom and the default buttons. Maximum 6 default buttons possible. */ + buttons_max_size = 6; + /* Custom buttons */ + if (taskconfig->cButtons && taskconfig->pButtons) buttons_max_size += taskconfig->cButtons; - if (!desc->default_button) - desc->default_button = &buttons[0]; + /* For easy handling just allocate as many lines as buttons, the worst case. s*/ + buttons = Alloc(buttons_max_size * sizeof(*buttons)); + line_widths = Alloc(buttons_max_size * sizeof(*line_widths)); - /* For easy handling just allocate as many lines as buttons, the worst case. */ - line_widths = Alloc(count * sizeof(*line_widths)); + if (taskconfig->cButtons && taskconfig->pButtons) + for (button_count = 0; button_count < taskconfig->cButtons; button_count++) + buttons[button_count].id = taskconfig->pButtons[button_count].nButtonID; + + /* Ok button may be added if no button is specified in taskconfig */ + if (GetDlgItem(dialog_info->hwnd, IDOK)) buttons[button_count++].id = IDOK; + if (flags & TDCBF_YES_BUTTON) buttons[button_count++].id = IDYES; + if (flags & TDCBF_NO_BUTTON) buttons[button_count++].id = IDNO; + if (flags & TDCBF_RETRY_BUTTON) buttons[button_count++].id = IDRETRY; + if (flags & TDCBF_CANCEL_BUTTON) buttons[button_count++].id = IDCANCEL; + if (flags & TDCBF_CLOSE_BUTTON) buttons[button_count++].id = IDCLOSE; + + button_min_width = DIALOG_BUTTON_WIDTH; + dialogunits_to_pixels(dialog_info, &button_min_width, 0); + for (i = 0; i < button_count; i++) + { + hwnd = GetDlgItem(dialog_info->hwnd, buttons[i].id); + taskdialog_get_label_size(hwnd, dialog_width - horizontal_spacing, &size); + buttons[i].width = max(size.cx, button_min_width); + buttons[i].line = 0; + } /* Separate buttons into lines */ - location_x = DIALOG_SPACING; - for (i = 0, line_count = 0; i < count; i++) + x = horizontal_spacing; + for (i = 0, line_count = 0; i < button_count; i++) { - if (location_x + buttons[i].width + DIALOG_SPACING > desc->dialog_width) + if (x + buttons[i].width + horizontal_spacing >= dialog_width) { - location_x = DIALOG_SPACING; + x = horizontal_spacing; line_count++; } buttons[i].line = line_count; - location_x += buttons[i].width + DIALOG_SPACING; - line_widths[line_count] += buttons[i].width + DIALOG_SPACING; + x += buttons[i].width + horizontal_spacing; + line_widths[line_count] += buttons[i].width + horizontal_spacing; } line_count++; @@ -324,9 +400,8 @@ static unsigned int taskdialog_add_buttons(struct taskdialog_template_desc *desc unsigned int j, last_button = 0; int diff_changed; - for (j = 0; j < count; j++) - if (buttons[j].line == i - 1) - last_button = j; + for (j = 0; j < button_count; j++) + if (buttons[j].line == i - 1) last_button = j; /* Difference in length of both lines if we wrapped the last button from the last line into this one */ diff_changed = abs(2 * buttons[last_button].width + line_widths[i] - line_widths[i - 1]); @@ -340,38 +415,58 @@ static unsigned int taskdialog_add_buttons(struct taskdialog_template_desc *desc } /* Calculate left alignment so all lines are as far right as possible. */ + alignment = dialog_width; for (i = 0; i < line_count; i++) { - int new_alignment = desc->dialog_width - line_widths[i]; - if (new_alignment < alignment) - alignment = new_alignment; + int new_alignment = dialog_width - line_widths[i]; + if (new_alignment < alignment) alignment = new_alignment; } - /* Now that we got them all positioned, create all buttons */ - location_x = alignment; - for (i = 0; i < count; i++) + /* Now that we got them all positioned, move all buttons */ + x = alignment; + size.cy = DIALOG_BUTTON_HEIGHT; + dialogunits_to_pixels(dialog_info, NULL, &size.cy); + for (i = 0; i < button_count; i++) { - DWORD style = &buttons[i] == desc->default_button ? BS_DEFPUSHBUTTON : BS_PUSHBUTTON; - - if (i > 0 && buttons[i].line != buttons[i - 1].line) /* New line */ + /* New line */ + if (i > 0 && buttons[i].line != buttons[i - 1].line) { - location_x = alignment; - desc->dialog_height += DIALOG_BUTTON_HEIGHT + DIALOG_SPACING; + x = alignment; + dialog_height += size.cy + vertical_spacing; } - size += taskdialog_add_control(desc, buttons[i].id, WC_BUTTONW, buttons[i].hinst, buttons[i].text, style, - location_x, desc->dialog_height, buttons[i].width, DIALOG_BUTTON_HEIGHT); - - location_x += buttons[i].width + DIALOG_SPACING; + y = dialog_height + vertical_spacing; + size.cx = buttons[i].width; + hwnd = GetDlgItem(dialog_info->hwnd, buttons[i].id); + MoveWindow(hwnd, x, y, size.cx, size.cy, TRUE); + x += buttons[i].width + horizontal_spacing; } - /* Add height for last row and spacing */ - desc->dialog_height += DIALOG_BUTTON_HEIGHT + DIALOG_SPACING; + /* Add height for last row button and spacing */ + dialog_height += size.cy + vertical_spacing; Free(line_widths); Free(buttons); - return size; + /* Add height for spacing, title height and frame height */ + dialog_height += vertical_spacing; + dialog_height += GetSystemMetrics(SM_CYCAPTION); + dialog_height += GetSystemMetrics(SM_CXDLGFRAME); + + if (first_time) + { + x = (ref_rect.left + ref_rect.right + dialog_width) / 2; + y = (ref_rect.top + ref_rect.bottom + dialog_height) / 2; + first_time = FALSE; + } + else + { + GetWindowRect(dialog_info->hwnd, &window_rect); + x = window_rect.left; + y = window_rect.top; + } + + MoveWindow(dialog_info->hwnd, x, y, dialog_width, dialog_height, TRUE); } static void taskdialog_clear_controls(struct list *controls) @@ -386,28 +481,6 @@ static void taskdialog_clear_controls(struct list *controls) } } -static unsigned int taskdialog_get_reference_rect(const struct taskdialog_template_desc *desc, RECT *ret) -{ - HMONITOR monitor = MonitorFromWindow(desc->taskconfig->hwndParent ? desc->taskconfig->hwndParent : GetActiveWindow(), - MONITOR_DEFAULTTOPRIMARY); - MONITORINFO info; - - info.cbSize = sizeof(info); - GetMonitorInfoW(monitor, &info); - - if (desc->taskconfig->dwFlags & TDF_POSITION_RELATIVE_TO_WINDOW && desc->taskconfig->hwndParent) - GetWindowRect(desc->taskconfig->hwndParent, ret); - else - *ret = info.rcWork; - - pixels_to_dialogunits(desc, &ret->left, &ret->top); - pixels_to_dialogunits(desc, &ret->right, &ret->bottom); - - pixels_to_dialogunits(desc, &info.rcWork.left, &info.rcWork.top); - pixels_to_dialogunits(desc, &info.rcWork.right, &info.rcWork.bottom); - return info.rcWork.right - info.rcWork.left; -} - static WCHAR *taskdialog_get_exe_name(const TASKDIALOGCONFIG *taskconfig, WCHAR *name, DWORD length) { DWORD len = GetModuleFileNameW(NULL, name, length); @@ -425,17 +498,14 @@ static WCHAR *taskdialog_get_exe_name(const TASKDIALOGCONFIG *taskconfig, WCHAR static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfig) { struct taskdialog_control *control, *control2; - unsigned int size, title_size, screen_width; + unsigned int size, title_size; struct taskdialog_template_desc desc; static const WORD fontsize = 0x7fff; static const WCHAR emptyW[] = { 0 }; const WCHAR *titleW = NULL; DLGTEMPLATE *template; - NONCLIENTMETRICSW ncm; WCHAR pathW[MAX_PATH]; - RECT ref_rect; char *ptr; - HDC hdc; /* Window title */ if (!taskconfig->pszWindowTitle) @@ -459,22 +529,6 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi desc.taskconfig = taskconfig; desc.control_count = 0; - ncm.cbSize = sizeof(ncm); - SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0); - desc.font = CreateFontIndirectW(&ncm.lfMessageFont); - - hdc = GetDC(0); - SelectObject(hdc, desc.font); - desc.x_baseunit = GdiGetCharDimensions(hdc, NULL, &desc.y_baseunit); - ReleaseDC(0, hdc); - - screen_width = taskdialog_get_reference_rect(&desc, &ref_rect); - - desc.dialog_height = 0; - desc.dialog_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH); - desc.dialog_width = min(desc.dialog_width, screen_width); - desc.default_button = NULL; - size += taskdialog_add_main_instruction(&desc); size += taskdialog_add_content(&desc); size += taskdialog_add_buttons(&desc); @@ -483,16 +537,11 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi if (!template) { taskdialog_clear_controls(&desc.controls); - DeleteObject(desc.font); return NULL; } template->style = DS_MODALFRAME | DS_SETFONT | WS_CAPTION | WS_VISIBLE | WS_SYSMENU; 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; - template->cx = desc.dialog_width; - template->cy = desc.dialog_height; ptr = (char *)(template + 1); ptr += 2; /* menu */ @@ -513,22 +562,32 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi Free(control); } - DeleteObject(desc.font); return template; } -static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notification, WPARAM wparam, LPARAM lparam) -{ - return dialog_info->callback ? dialog_info->callback(dialog_info->hwnd, notification, wparam, lparam, - dialog_info->callback_data) : S_OK; -} - static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD command_id) { if (taskdialog_notify(dialog_info, TDN_BUTTON_CLICKED, command_id, 0) == S_OK) EndDialog(dialog_info->hwnd, command_id); } +static void taskdialog_init_dialog_info(struct taskdialog_info *dialog_info, HWND hwnd) +{ + NONCLIENTMETRICSW ncm; + HDC hdc; + + dialog_info->hwnd = hwnd; + + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0); + dialog_info->hfont = CreateFontIndirectW(&ncm.lfMessageFont); + + hdc = GetDC(0); + SelectObject(hdc, dialog_info->hfont); + dialog_info->x_baseunit = GdiGetCharDimensions(hdc, NULL, &dialog_info->y_baseunit); + ReleaseDC(0, hdc); +} + 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}; @@ -546,8 +605,10 @@ 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; + taskdialog_init_dialog_info(dialog_info, hwnd); + SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); + taskdialog_resize(dialog_info); taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); break; @@ -584,8 +645,7 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *butto if (!taskconfig || taskconfig->cbSize != sizeof(TASKDIALOGCONFIG)) return E_INVALIDARG; - dialog_info.callback = taskconfig->pfCallback; - dialog_info.callback_data = taskconfig->lpCallbackData; + dialog_info.taskconfig = taskconfig; template = create_taskdialog_template(taskconfig); ret = (short)DialogBoxIndirectParamW(taskconfig->hInstance, template, taskconfig->hwndParent, -- 2.17.0

2 2

[PATCH v2 1/5] msi: Avoid leaking memory on failure paths in MsiGetPropertyA().
by Zebediah Figura 17 May '18

17 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/package.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ab6c3dd..2801efa 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2368,9 +2368,14 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD DWORD len; if (!(remote = msi_get_remote(hinst))) + { + heap_free(nameW); return ERROR_INVALID_HANDLE; + } r = remote_GetProperty(remote, nameW, &value, &len); + heap_free(nameW); + if (!r) { /* String might contain embedded nulls. @@ -2388,7 +2393,6 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD heap_free(tmp); } midl_user_free(value); - heap_free(nameW); return r; } -- 2.7.4

3 11

[PATCH 1/4] msi: Handle the remote case directly in MsiGetTargetPathA().
by Zebediah Figura 17 May '18

17 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/install.c | 45 +++++++++++++++++++++++++++++++++------------ dlls/msi/tests/custom.c | 8 ++++---- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index b54daff..9677be5 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -271,26 +271,47 @@ static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, /*********************************************************************** * MsiGetTargetPathA (MSI.@) */ -UINT WINAPI MsiGetTargetPathA( MSIHANDLE hInstall, LPCSTR szFolder, - LPSTR szPathBuf, LPDWORD pcchPathBuf ) +UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DWORD *sz) { - LPWSTR szwFolder; - awstring path; + MSIPACKAGE *package; + const WCHAR *path; + WCHAR *folderW; UINT r; - TRACE("%s %p %p\n", debugstr_a(szFolder), szPathBuf, pcchPathBuf); + TRACE("%s %p %p\n", debugstr_a(folder), buf, sz); - szwFolder = strdupAtoW(szFolder); - if (szFolder && !szwFolder) - return ERROR_FUNCTION_FAILED; + if (!folder) + return ERROR_INVALID_PARAMETER; - path.unicode = FALSE; - path.str.a = szPathBuf; + if (!(folderW = strdupAtoW(folder))) + return ERROR_OUTOFMEMORY; - r = MSI_GetTargetPath( hInstall, szwFolder, &path, pcchPathBuf ); + package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); + if (!package) + { + WCHAR *path = NULL; + MSIHANDLE remote; - msi_free( szwFolder ); + if (!(remote = msi_get_remote(hinst))) + return ERROR_INVALID_HANDLE; + r = remote_GetTargetPath(remote, folderW, &path); + if (!r) + r = msi_strncpyWtoA(path, -1, buf, sz, TRUE); + + midl_user_free(path); + heap_free(folderW); + return r; + } + + path = msi_get_target_folder(package, folderW); + if (path) + r = msi_strncpyWtoA(path, -1, buf, sz, FALSE); + else + r = ERROR_DIRECTORY; + + heap_free(folderW); + msiobj_release(&package->hdr); return r; } diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index d240964..4e42eed 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -485,28 +485,28 @@ static void test_targetpath(MSIHANDLE hinst) sz = 0; r = MsiGetTargetPathA(hinst, "TARGETDIR", NULL, &sz); ok(hinst, !r, "got %u\n", r); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 0; strcpy(buffer,"q"); r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 1; strcpy(buffer,"x"); r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !buffer[0], "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 3; strcpy(buffer,"x"); r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "C:"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 4; strcpy(buffer,"x"); -- 2.7.4

3 10

[PATCH 1/2] wined3d: Allow creating swapchains for windows with empty client rect.
by Józef Kucia 17 May '18

17 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ea93212a24f9..7a3f1ff95e90 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -796,15 +796,16 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 GetClientRect(window, &client_rect); if (desc->windowed) { + TRACE("Client rect %s.\n", wine_dbgstr_rect(&client_rect)); + if (!desc->backbuffer_width) { - desc->backbuffer_width = client_rect.right; + desc->backbuffer_width = client_rect.right ? client_rect.right : 8; TRACE("Updating width to %u.\n", desc->backbuffer_width); } - if (!desc->backbuffer_height) { - desc->backbuffer_height = client_rect.bottom; + desc->backbuffer_height = client_rect.bottom ? client_rect.bottom : 8; TRACE("Updating height to %u.\n", desc->backbuffer_height); } -- 2.16.1

2 3

[PATCH 1/5] wined3d: Implement oMask register.
by Józef Kucia 17 May '18

17 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 10 ++++++++++ dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 6 ++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index da7e70071d19..6f23cf8a4034 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3242,6 +3242,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "vpc[%u]", reg->idx[0].offset); break; + case WINED3DSPR_SAMPLEMASK: + sprintf(register_name, "sample_mask"); + break; + default: FIXME("Unhandled register type %#x.\n", reg->type); sprintf(register_name, "unrecognized_register"); @@ -7627,6 +7631,9 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in shader_glsl_generate_fog_code(buffer, gl_info, args->fog); shader_glsl_generate_alpha_test(buffer, gl_info, args->alpha_test_func + 1); + + if (reg_maps->sample_mask) + shader_addline(buffer, "gl_SampleMask[0] = floatBitsToInt(sample_mask);\n"); } /* Context activation is done by the caller. */ @@ -7822,6 +7829,9 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "void main()\n{\n"); + if (reg_maps->sample_mask) + shader_addline(buffer, "float sample_mask = uintBitsToFloat(0xffffffffu);\n"); + /* Direct3D applications expect integer vPos values, while OpenGL drivers * add approximately 0.5. This causes off-by-one problems as spotted by * the vPos d3d9 visual test. Unfortunately ATI cards do not add exactly diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 45ae04a9bec9..3a0a3022172f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -810,6 +810,10 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w reg_maps->vocp = 1; break; + case WINED3DSPR_SAMPLEMASK: + reg_maps->sample_mask = 1; + break; + default: TRACE("Not recording register of type %#x and [%#x][%#x].\n", reg->type, reg->idx[0].offset, reg->idx[1].offset); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b2e4372e9ae5..f40d1639496b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1040,7 +1040,8 @@ struct wined3d_shader_reg_maps DWORD vocp : 1; DWORD input_rel_addressing : 1; DWORD viewport_array : 1; - DWORD padding : 15; + DWORD sample_mask : 1; + DWORD padding : 14; DWORD rt_mask; /* Used render targets, 32 max. */ @@ -4115,13 +4116,14 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) /* oPos */ return FALSE; + case WINED3DSPR_CONSTBOOL: /* b# */ case WINED3DSPR_DEPTHOUT: /* oDepth */ case WINED3DSPR_DEPTHOUTGE: case WINED3DSPR_DEPTHOUTLE: - case WINED3DSPR_CONSTBOOL: /* b# */ case WINED3DSPR_LOOP: /* aL */ case WINED3DSPR_PREDICATE: /* p0 */ case WINED3DSPR_PRIMID: /* primID */ + case WINED3DSPR_SAMPLEMASK: /* oMask */ return TRUE; case WINED3DSPR_MISCTYPE: -- 2.16.1

2 9

[PATCH 3/3] mshtml: Implement supported IHTMLWindow7 event properties.
by Jacek Caban 17 May '18

17 May '18

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

1 0

[PATCH 2/3] mshtml: Added IHTMLWindow7 stub implementation.
by Jacek Caban 17 May '18

17 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 347 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + 2 files changed, 349 insertions(+)

1 0

[PATCH 1/3] mshtml.idl: Added IHTMLWindow7 declaration.
by Jacek Caban 17 May '18

17 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 71 ++++ include/mshtml.idl | 1170 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 1211 insertions(+), 30 deletions(-)

1 0

[PATCH 7/7] comctl32/taskdialog: Add support for TDF_RTL_LAYOUT.
by Zhiyi Zhang 17 May '18

17 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 7066b793c8..5cd1d05642 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -543,6 +543,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; ptr = (char *)(template + 1); -- 2.17.0

2 3

[PATCH 6/7] comctl32/taskdialog: Add support for TDF_NO_SET_FOREGROUND.
by Zhiyi Zhang 17 May '18

17 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 a0d38051b2..7066b793c8 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -542,6 +542,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; ptr = (char *)(template + 1); -- 2.17.0

2 2

[PATCH] d3d11: Add support for DepthClipEnable in RSSetState.
by Zebediah Figura 17 May '18

17 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/device.c | 2 -- dlls/d3d11/device.c | 5 ++--- dlls/d3d11/tests/d3d11.c | 2 -- dlls/wined3d/directx.c | 1 + dlls/wined3d/state.c | 24 ++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 2 ++ dlls/wined3d/utils.c | 1 + dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 3 ++- 9 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4b39c1b..50521bd 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16894,12 +16894,10 @@ static void test_depth_clip(void) ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); draw_quad_z(&test_context, 2.0f); -todo_wine check_texture_float(texture, 0.6f, 1); draw_quad_z(&test_context, 0.5f); check_texture_float(texture, 0.5f, 1); draw_quad_z(&test_context, -1.0f); -todo_wine check_texture_float(texture, 0.4f, 1); ID3D10DepthStencilView_Release(dsv); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c930248..37ad327 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -932,6 +932,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_BACK); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, 0); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHCLIP, TRUE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE); @@ -948,9 +949,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon const_bias.f = desc->DepthBias; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, const_bias.d); - /* GL_DEPTH_CLAMP */ - if (!desc->DepthClipEnable) - FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHCLIP, desc->DepthClipEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); wined3d_device_set_render_state(device->wined3d_device, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9e673ee..8269df4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26875,12 +26875,10 @@ static void test_depth_clip(void) ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); draw_quad_z(&test_context, 2.0f); -todo_wine check_texture_float(texture, 0.6f, 1); draw_quad_z(&test_context, 0.5f); check_texture_float(texture, 0.5f, 1); draw_quad_z(&test_context, -1.0f); -todo_wine check_texture_float(texture, 0.4f, 1); ID3D11DepthStencilView_Release(dsv); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e125c5f..0199b99 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -122,6 +122,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_cull_distance", ARB_CULL_DISTANCE }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, + {"GL_ARB_depth_clamp", ARB_DEPTH_CLAMP }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, {"GL_ARB_derivative_control", ARB_DERIVATIVE_CONTROL }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 34e08e9..83903e2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1821,6 +1821,28 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 checkGLcall("depth bias"); } +static void state_depthclip(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (state->render_states[WINED3D_RS_DEPTHCLIP]) + { + gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_CLAMP); + checkGLcall("glDisable(GL_DEPTH_CLAMP)"); + } + else + { + gl_info->gl_ops.gl.p_glEnable(GL_DEPTH_CLAMP); + checkGLcall("glEnable(GL_DEPTH_CLAMP)"); + } +} + +static void state_depthclip_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + if (!state->render_states[WINED3D_RS_DEPTHCLIP]) + FIXME("Depth clamping not supported by GL.\n"); +} + static void state_zvisible(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_ZVISIBLE]) @@ -4661,6 +4683,8 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_BLENDFACTOR), { STATE_RENDER(WINED3D_RS_BLENDFACTOR), state_blendfactor_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), state_depthbias }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZVISIBLE), { STATE_RENDER(WINED3D_RS_ZVISIBLE), state_zvisible }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3D_RS_DEPTHCLIP), { STATE_RENDER(WINED3D_RS_DEPTHCLIP), state_depthclip }, ARB_DEPTH_CLAMP }, + { STATE_RENDER(WINED3D_RS_DEPTHCLIP), { STATE_RENDER(WINED3D_RS_DEPTHCLIP), state_depthclip_w }, WINED3D_GL_EXT_NONE }, /* Samplers */ { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b4d1751..a60903d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -90,6 +90,7 @@ static const DWORD pixel_states_render[] = WINED3D_RS_ZENABLE, WINED3D_RS_ZFUNC, WINED3D_RS_ZWRITEENABLE, + WINED3D_RS_DEPTHCLIP, }; static const DWORD pixel_states_texture[] = @@ -1257,6 +1258,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->render_states[WINED3D_RS_BLENDFACTOR] = 0xffffffff; state->render_states[WINED3D_RS_SRGBWRITEENABLE] = 0; state->render_states[WINED3D_RS_DEPTHBIAS] = 0; + state->render_states[WINED3D_RS_DEPTHCLIP] = TRUE; state->render_states[WINED3D_RS_WRAP8] = 0; state->render_states[WINED3D_RS_WRAP9] = 0; state->render_states[WINED3D_RS_WRAP10] = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 49b08bf..e25b95e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4434,6 +4434,7 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) D3DSTATE_TO_STR(WINED3D_RS_SRCBLENDALPHA); D3DSTATE_TO_STR(WINED3D_RS_DESTBLENDALPHA); D3DSTATE_TO_STR(WINED3D_RS_BLENDOPALPHA); + D3DSTATE_TO_STR(WINED3D_RS_DEPTHCLIP); #undef D3DSTATE_TO_STR default: FIXME("Unrecognized %u render state!\n", state); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3140526..525c298 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -55,6 +55,7 @@ enum wined3d_gl_extension ARB_CULL_DISTANCE, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, + ARB_DEPTH_CLAMP, ARB_DEPTH_TEXTURE, ARB_DERIVATIVE_CONTROL, ARB_DRAW_BUFFERS, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 15e14e5..09e3a4e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -386,8 +386,9 @@ enum wined3d_render_state WINED3D_RS_SRCBLENDALPHA = 207, WINED3D_RS_DESTBLENDALPHA = 208, WINED3D_RS_BLENDOPALPHA = 209, + WINED3D_RS_DEPTHCLIP = 210, }; -#define WINEHIGHEST_RENDER_STATE WINED3D_RS_BLENDOPALPHA +#define WINEHIGHEST_RENDER_STATE WINED3D_RS_DEPTHCLIP enum wined3d_blend { -- 2.7.4

3 2

[PATCH 1/3] gdi32: Add bounds checking for metafile records.
by Vincent Povirk 17 May '18

17 May '18

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdi32/enhmetafile.c | 610 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 610 insertions(+) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 2d8a9b04fb2..d8f72c98718 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -743,6 +743,604 @@ static BOOL emr_produces_output(int type) } } +static BOOL emr_validate_size(const ENHMETARECORD *emr) +{ + switch(emr->iType) { + case EMR_HEADER: + if (emr->nSize < FIELD_OFFSET(ENHMETAHEADER, cbPixelFormat)) return FALSE; + break; + case EMR_EOF: + { + const EMREOF *lpEof = (const EMREOF *)emr; + if (emr->nSize < sizeof(EMREOF) || + (lpEof->nPalEntries * 4 / 4) != lpEof->nPalEntries || + lpEof->offPalEntries > lpEof->offPalEntries + lpEof->nPalEntries * 4 || + emr->nSize < lpEof->offPalEntries + lpEof->nPalEntries * 4) + return FALSE; + break; + } + case EMR_GDICOMMENT: + { + const EMRGDICOMMENT *lpGdiComment = (const EMRGDICOMMENT *)emr; + if (emr->nSize < FIELD_OFFSET(EMRGDICOMMENT, Data) || + lpGdiComment->cbData > lpGdiComment->cbData + FIELD_OFFSET(EMRGDICOMMENT, Data) || + emr->nSize < lpGdiComment->cbData + FIELD_OFFSET(EMRGDICOMMENT, Data)) + return FALSE; + break; + } + case EMR_SETMAPMODE: + if (emr->nSize < sizeof(EMRSETMAPMODE)) return FALSE; + break; + case EMR_SETBKMODE: + if (emr->nSize < sizeof(EMRSETBKMODE)) return FALSE; + break; + case EMR_SETBKCOLOR: + if (emr->nSize < sizeof(EMRSETBKCOLOR)) return FALSE; + break; + case EMR_SETPOLYFILLMODE: + if (emr->nSize < sizeof(EMRSETPOLYFILLMODE)) return FALSE; + break; + case EMR_SETROP2: + if (emr->nSize < sizeof(EMRSETROP2)) return FALSE; + break; + case EMR_SETTEXTALIGN: + if (emr->nSize < sizeof(EMRSETTEXTALIGN)) return FALSE; + break; + case EMR_SETTEXTCOLOR: + if (emr->nSize < sizeof(EMRSETTEXTCOLOR)) return FALSE; + break; + case EMR_SAVEDC: + if (emr->nSize < sizeof(EMRSAVEDC)) return FALSE; + break; + case EMR_RESTOREDC: + if (emr->nSize < sizeof(EMRRESTOREDC)) return FALSE; + break; + case EMR_INTERSECTCLIPRECT: + if (emr->nSize < sizeof(EMRINTERSECTCLIPRECT)) return FALSE; + break; + case EMR_SELECTOBJECT: + if (emr->nSize < sizeof(EMRSELECTOBJECT)) return FALSE; + break; + case EMR_DELETEOBJECT: + if (emr->nSize < sizeof(EMRDELETEOBJECT)) return FALSE; + break; + case EMR_SETWINDOWORGEX: + if (emr->nSize < sizeof(EMRSETWINDOWORGEX)) return FALSE; + break; + case EMR_SETWINDOWEXTEX: + if (emr->nSize < sizeof(EMRSETWINDOWEXTEX)) return FALSE; + break; + case EMR_SETVIEWPORTORGEX: + if (emr->nSize < sizeof(EMRSETVIEWPORTORGEX)) return FALSE; + break; + case EMR_SETVIEWPORTEXTEX: + if (emr->nSize < sizeof(EMRSETVIEWPORTEXTEX)) return FALSE; + break; + case EMR_CREATEPEN: + if (emr->nSize < sizeof(EMRCREATEPEN)) return FALSE; + break; + case EMR_EXTCREATEPEN: + { + const EMREXTCREATEPEN *pPen = (const EMREXTCREATEPEN *)emr; + if (emr->nSize < sizeof(EMREXTCREATEPEN) || + pPen->cbBmi > pPen->offBmi + pPen->cbBmi || + emr->nSize < pPen->offBmi + pPen->cbBmi || + pPen->cbBits > pPen->offBits + pPen->cbBits || + emr->nSize < pPen->offBits + pPen->cbBits || + (pPen->elp.elpNumEntries * 4 / 4) != pPen->elp.elpNumEntries || + pPen->elp.elpNumEntries * 4 > pPen->elp.elpNumEntries * 4 + FIELD_OFFSET(EMREXTCREATEPEN, elp.elpStyleEntry) || + emr->nSize < pPen->elp.elpNumEntries * 4 + FIELD_OFFSET(EMREXTCREATEPEN, elp.elpStyleEntry)) + return FALSE; + /* FIXME: validate DIB size */ + break; + } + case EMR_CREATEBRUSHINDIRECT: + if (emr->nSize < sizeof(EMRCREATEBRUSHINDIRECT)) return FALSE; + break; + case EMR_EXTCREATEFONTINDIRECTW: + if (emr->nSize < sizeof(EMREXTCREATEFONTINDIRECTW)) return FALSE; + break; + case EMR_MOVETOEX: + if (emr->nSize < sizeof(EMRMOVETOEX)) return FALSE; + break; + case EMR_LINETO: + if (emr->nSize < sizeof(EMRLINETO)) return FALSE; + break; + case EMR_RECTANGLE: + if (emr->nSize < sizeof(EMRRECTANGLE)) return FALSE; + break; + case EMR_ELLIPSE: + if (emr->nSize < sizeof(EMRELLIPSE)) return FALSE; + break; + case EMR_POLYGON16: + case EMR_POLYLINE16: + case EMR_POLYLINETO16: + case EMR_POLYBEZIER16: + case EMR_POLYBEZIERTO16: + { + const EMRPOLYGON16 *pPoly = (const EMRPOLYGON16 *)emr; + DWORD pts_ofs = FIELD_OFFSET(EMRPOLYGON16, apts); + if (emr->nSize < FIELD_OFFSET(EMRPOLYGON16, apts) || + (pPoly->cpts * 4 / 4) != pPoly->cpts || + pts_ofs > pts_ofs + pPoly->cpts * 4 || + emr->nSize < pts_ofs + pPoly->cpts * 4) + return FALSE; + break; + } + case EMR_POLYPOLYGON16: + case EMR_POLYPOLYLINE16: + { + const EMRPOLYPOLYGON16 *pPolyPoly = (const EMRPOLYPOLYGON16 *)emr; + DWORD counts_ofs = FIELD_OFFSET(EMRPOLYPOLYGON16, aPolyCounts); + DWORD points_ofs, total_points=0, i; + if (emr->nSize < FIELD_OFFSET(EMRPOLYPOLYGON16, aPolyCounts) || + (pPolyPoly->nPolys * 4 / 4) != pPolyPoly->nPolys || + counts_ofs > counts_ofs + pPolyPoly->nPolys * 4 || + emr->nSize < counts_ofs + pPolyPoly->nPolys * 4) + return FALSE; + points_ofs = counts_ofs + pPolyPoly->nPolys * 4; + if ((pPolyPoly->cpts * 4 / 4) != pPolyPoly->cpts || + points_ofs > points_ofs + pPolyPoly->cpts * 4 || + emr->nSize < points_ofs + pPolyPoly->cpts * 4) + return FALSE; + + for(i = 0; i < pPolyPoly->nPolys; i++) + { + if (total_points > total_points + pPolyPoly->aPolyCounts[i] || + pPolyPoly->cpts < total_points + pPolyPoly->aPolyCounts[i]) + return FALSE; + total_points += pPolyPoly->aPolyCounts[i]; + } + break; + } + case EMR_STRETCHDIBITS: + if (emr->nSize < sizeof(EMRSTRETCHDIBITS)) return FALSE; + /* FIXME: validate DIB size */ + break; + case EMR_EXTTEXTOUTA: + { + const EMREXTTEXTOUTA *pExtTextOutA = (const EMREXTTEXTOUTA *)emr; + DWORD string_ofs, dx_ofs; + if (emr->nSize < sizeof(EMREXTTEXTOUTA)) + return FALSE; + string_ofs = pExtTextOutA->emrtext.offString; + if (string_ofs > string_ofs + pExtTextOutA->emrtext.nChars || + emr->nSize < string_ofs + pExtTextOutA->emrtext.nChars) + return FALSE; + dx_ofs = pExtTextOutA->emrtext.offDx; + if (dx_ofs && ( + pExtTextOutA->emrtext.nChars * 4 / 4 != pExtTextOutA->emrtext.nChars || + dx_ofs > dx_ofs + pExtTextOutA->emrtext.nChars * 4 || + emr->nSize < dx_ofs + pExtTextOutA->emrtext.nChars * 4)) + return FALSE; + break; + } + + case EMR_EXTTEXTOUTW: + { + const EMREXTTEXTOUTW *pExtTextOutW = (const EMREXTTEXTOUTW *)emr; + DWORD string_ofs, dx_ofs; + if (emr->nSize < sizeof(EMREXTTEXTOUTW)) + return FALSE; + string_ofs = pExtTextOutW->emrtext.offString; + if (string_ofs > string_ofs + pExtTextOutW->emrtext.nChars || + pExtTextOutW->emrtext.nChars * 2 / 2 != pExtTextOutW->emrtext.nChars || + emr->nSize < string_ofs + pExtTextOutW->emrtext.nChars * 2) + return FALSE; + dx_ofs = pExtTextOutW->emrtext.offDx; + if (dx_ofs && ( + pExtTextOutW->emrtext.nChars * 4 / 4 != pExtTextOutW->emrtext.nChars || + dx_ofs > dx_ofs + pExtTextOutW->emrtext.nChars * 4 || + emr->nSize < dx_ofs + pExtTextOutW->emrtext.nChars * 4)) + return FALSE; + break; + } + + case EMR_CREATEPALETTE: + { + const EMRCREATEPALETTE *lpCreatePal = (const EMRCREATEPALETTE *)emr; + DWORD entries_ofs = FIELD_OFFSET(EMRCREATEPALETTE, lgpl.palPalEntry); + + if (emr->nSize < FIELD_OFFSET(EMRCREATEPALETTE, lgpl.palPalEntry) || + lpCreatePal->lgpl.palNumEntries * 4 / 4 != lpCreatePal->lgpl.palNumEntries || + entries_ofs > entries_ofs + lpCreatePal->lgpl.palNumEntries * 4 || + emr->nSize < entries_ofs + lpCreatePal->lgpl.palNumEntries * 4) + return FALSE; + + break; + } + + case EMR_SELECTPALETTE: + if (emr->nSize < sizeof(EMRSELECTPALETTE)) return FALSE; + break; + case EMR_REALIZEPALETTE: + if (emr->nSize < sizeof(EMRREALIZEPALETTE)) return FALSE; + break; + case EMR_EXTSELECTCLIPRGN: + { + const EMREXTSELECTCLIPRGN *lpRgn = (const EMREXTSELECTCLIPRGN *)emr; + DWORD data_ofs = FIELD_OFFSET(EMREXTSELECTCLIPRGN, RgnData); + + if (emr->nSize < FIELD_OFFSET(EMREXTSELECTCLIPRGN, RgnData) || + data_ofs > data_ofs + lpRgn->cbRgnData || + emr->nSize < data_ofs + lpRgn->cbRgnData) + return FALSE; + + break; + } + + case EMR_SETMETARGN: + if (emr->nSize < sizeof(EMRSETMETARGN)) return FALSE; + break; + case EMR_SETWORLDTRANSFORM: + if (emr->nSize < sizeof(EMRSETWORLDTRANSFORM)) return FALSE; + break; + case EMR_POLYBEZIER: + case EMR_POLYGON: + case EMR_POLYLINE: + case EMR_POLYBEZIERTO: + case EMR_POLYLINETO: + { + const EMRPOLYBEZIER *pPoly = (const EMRPOLYBEZIER *)emr; + DWORD pts_ofs = FIELD_OFFSET(EMRPOLYBEZIER, aptl); + if (emr->nSize < FIELD_OFFSET(EMRPOLYBEZIER, aptl) || + (pPoly->cptl * 8 / 8) != pPoly->cptl || + pts_ofs > pts_ofs + pPoly->cptl * 8 || + emr->nSize < pts_ofs + pPoly->cptl * 8) + return FALSE; + break; + } + case EMR_POLYPOLYLINE: + case EMR_POLYPOLYGON: + { + const EMRPOLYPOLYLINE *pPolyPoly = (const EMRPOLYPOLYLINE *)emr; + DWORD counts_ofs = FIELD_OFFSET(EMRPOLYPOLYLINE, aPolyCounts); + DWORD points_ofs, total_points=0, i; + if (emr->nSize < FIELD_OFFSET(EMRPOLYPOLYLINE, aPolyCounts) || + (pPolyPoly->nPolys * 4 / 4) != pPolyPoly->nPolys || + counts_ofs > counts_ofs + pPolyPoly->nPolys * 4 || + emr->nSize < counts_ofs + pPolyPoly->nPolys * 4) + return FALSE; + points_ofs = counts_ofs + pPolyPoly->nPolys * 4; + if ((pPolyPoly->cptl * 8 / 8) != pPolyPoly->cptl || + points_ofs > points_ofs + pPolyPoly->cptl * 8 || + emr->nSize < points_ofs + pPolyPoly->cptl * 8) + return FALSE; + + for(i = 0; i < pPolyPoly->nPolys; i++) + { + if (total_points > total_points + pPolyPoly->aPolyCounts[i] || + pPolyPoly->cptl < total_points + pPolyPoly->aPolyCounts[i]) + return FALSE; + total_points += pPolyPoly->aPolyCounts[i]; + } + break; + } + case EMR_SETBRUSHORGEX: + if (emr->nSize < sizeof(EMRSETBRUSHORGEX)) return FALSE; + break; + case EMR_SETPIXELV: + if (emr->nSize < sizeof(EMRSETPIXELV)) return FALSE; + break; + case EMR_SETMAPPERFLAGS: + if (emr->nSize < sizeof(EMRSETMAPPERFLAGS)) return FALSE; + break; + case EMR_SETCOLORADJUSTMENT: + if (emr->nSize < sizeof(EMRSETCOLORADJUSTMENT)) return FALSE; + break; + case EMR_OFFSETCLIPRGN: + if (emr->nSize < sizeof(EMROFFSETCLIPRGN)) return FALSE; + break; + case EMR_EXCLUDECLIPRECT: + if (emr->nSize < sizeof(EMREXCLUDECLIPRECT)) return FALSE; + break; + case EMR_SCALEVIEWPORTEXTEX: + if (emr->nSize < sizeof(EMRSCALEVIEWPORTEXTEX)) return FALSE; + break; + case EMR_SCALEWINDOWEXTEX: + if (emr->nSize < sizeof(EMRSCALEWINDOWEXTEX)) return FALSE; + break; + case EMR_MODIFYWORLDTRANSFORM: + if (emr->nSize < sizeof(EMRMODIFYWORLDTRANSFORM)) return FALSE; + break; + case EMR_ANGLEARC: + if (emr->nSize < sizeof(EMRANGLEARC)) return FALSE; + break; + case EMR_ROUNDRECT: + if (emr->nSize < sizeof(EMRROUNDRECT)) return FALSE; + break; + case EMR_ARC: + if (emr->nSize < sizeof(EMRARC)) return FALSE; + break; + case EMR_CHORD: + if (emr->nSize < sizeof(EMRCHORD)) return FALSE; + break; + case EMR_PIE: + if (emr->nSize < sizeof(EMRPIE)) return FALSE; + break; + case EMR_ARCTO: + if (emr->nSize < sizeof(EMRARCTO)) return FALSE; + break; + case EMR_EXTFLOODFILL: + if (emr->nSize < sizeof(EMREXTFLOODFILL)) return FALSE; + break; + case EMR_POLYDRAW: + { + const EMRPOLYDRAW *lpPolyDraw = (const EMRPOLYDRAW *)emr; + DWORD pts_ofs = FIELD_OFFSET(EMRPOLYDRAW, aptl); + if (emr->nSize < FIELD_OFFSET(EMRPOLYDRAW, aptl) || + (lpPolyDraw->cptl * 5 / 5) != lpPolyDraw->cptl || + pts_ofs > pts_ofs + lpPolyDraw->cptl * 5 || + emr->nSize < pts_ofs + lpPolyDraw->cptl * 5) + return FALSE; + break; + } + case EMR_SETARCDIRECTION: + if (emr->nSize < sizeof(EMRSETARCDIRECTION)) return FALSE; + break; + case EMR_SETMITERLIMIT: + if (emr->nSize < sizeof(EMRSETMITERLIMIT)) return FALSE; + break; + case EMR_BEGINPATH: + if (emr->nSize < sizeof(EMRBEGINPATH)) return FALSE; + break; + case EMR_ENDPATH: + if (emr->nSize < sizeof(EMRENDPATH)) return FALSE; + break; + case EMR_CLOSEFIGURE: + if (emr->nSize < sizeof(EMRCLOSEFIGURE)) return FALSE; + break; + case EMR_FILLPATH: + if (emr->nSize < sizeof(EMRFILLPATH)) return FALSE; + break; + case EMR_STROKEANDFILLPATH: + if (emr->nSize < sizeof(EMRSTROKEANDFILLPATH)) return FALSE; + break; + case EMR_STROKEPATH: + if (emr->nSize < sizeof(EMRSTROKEPATH)) return FALSE; + break; + case EMR_FLATTENPATH: + if (emr->nSize < sizeof(EMRFLATTENPATH)) return FALSE; + break; + case EMR_WIDENPATH: + if (emr->nSize < sizeof(EMRWIDENPATH)) return FALSE; + break; + case EMR_SELECTCLIPPATH: + if (emr->nSize < sizeof(EMRSELECTCLIPPATH)) return FALSE; + break; + case EMR_ABORTPATH: + if (emr->nSize < sizeof(EMRABORTPATH)) return FALSE; + break; + case EMR_CREATECOLORSPACE: + { + const EMRCREATECOLORSPACE *lpCreateColorSpace = (const EMRCREATECOLORSPACE*)emr; + DWORD i; + if (emr->nSize < FIELD_OFFSET(EMRCREATECOLORSPACE, lcs.lcsFilename)) return FALSE; + for (i=0; i<MAX_PATH; i++) + { + if (emr->nSize < FIELD_OFFSET(EMRCREATECOLORSPACE, lcs.lcsFilename[i+1])) return FALSE; + if (!lpCreateColorSpace->lcs.lcsFilename[i]) break; + } + if (i == MAX_PATH) return FALSE; + break; + } + + case EMR_SETCOLORSPACE: + if (emr->nSize < sizeof(EMRSETCOLORSPACE)) return FALSE; + break; + case EMR_DELETECOLORSPACE: + if (emr->nSize < sizeof(EMRDELETECOLORSPACE)) return FALSE; + break; + case EMR_SETICMMODE: + if (emr->nSize < sizeof(EMRSETICMMODE)) return FALSE; + break; + case EMR_PIXELFORMAT: + if (emr->nSize < sizeof(EMRPIXELFORMAT)) return FALSE; + break; + case EMR_SETPALETTEENTRIES: + { + const EMRSETPALETTEENTRIES *lpSetPaletteEntries = (const EMRSETPALETTEENTRIES *)emr; + DWORD entries_ofs = FIELD_OFFSET(EMRSETPALETTEENTRIES, aPalEntries); + + if (emr->nSize < FIELD_OFFSET(EMRSETPALETTEENTRIES, aPalEntries) || + (lpSetPaletteEntries->cEntries * 4 / 4) != lpSetPaletteEntries->cEntries || + entries_ofs > entries_ofs + lpSetPaletteEntries->cEntries * 4 || + emr->nSize < entries_ofs + lpSetPaletteEntries->cEntries * 4) + return FALSE; + + break; + } + case EMR_RESIZEPALETTE: + if (emr->nSize < sizeof(EMRRESIZEPALETTE)) return FALSE; + break; + case EMR_CREATEDIBPATTERNBRUSHPT: + if (emr->nSize < sizeof(EMRCREATEDIBPATTERNBRUSHPT)) return FALSE; + /* FIXME: validate dib size */ + break; + case EMR_CREATEMONOBRUSH: + if (emr->nSize < sizeof(EMRCREATEMONOBRUSH)) return FALSE; + /* FIXME: validate dib size */ + break; + case EMR_BITBLT: + if (emr->nSize < sizeof(EMRBITBLT)) return FALSE; + /* FIXME: validate dib size */ + break; + case EMR_STRETCHBLT: + if (emr->nSize < sizeof(EMRSTRETCHBLT)) return FALSE; + /* FIXME: validate dib size */ + break; + case EMR_ALPHABLEND: + if (emr->nSize < sizeof(EMRALPHABLEND)) return FALSE; + /* FIXME: validate dib size */ + break; + case EMR_MASKBLT: + if (emr->nSize < sizeof(EMRMASKBLT)) return FALSE; + /* FIXME: validate dib size */ + break; + case EMR_PLGBLT: + { + const EMRPLGBLT *pPlgBlt = (const EMRPLGBLT *)emr; + if (emr->nSize < sizeof(EMRPLGBLT) || + pPlgBlt->offBmiSrc > pPlgBlt->offBmiSrc + pPlgBlt->cbBmiSrc || + emr->nSize < pPlgBlt->offBmiSrc + pPlgBlt->cbBmiSrc || + pPlgBlt->offBitsSrc > pPlgBlt->offBitsSrc + pPlgBlt->cbBitsSrc || + emr->nSize < pPlgBlt->offBitsSrc + pPlgBlt->cbBitsSrc || + pPlgBlt->offBmiMask > pPlgBlt->offBmiMask + pPlgBlt->cbBmiMask || + emr->nSize < pPlgBlt->offBmiMask + pPlgBlt->cbBmiMask || + pPlgBlt->offBitsMask > pPlgBlt->offBitsMask + pPlgBlt->cbBitsMask || + emr->nSize < pPlgBlt->offBitsMask + pPlgBlt->cbBitsMask) + return FALSE; + /* FIXME: validate dib size */ + break; + } + + case EMR_SETDIBITSTODEVICE: + { + const EMRSETDIBITSTODEVICE *pSetDIBitsToDevice = (const EMRSETDIBITSTODEVICE *)emr; + if (emr->nSize < sizeof(EMRSETDIBITSTODEVICE) || + pSetDIBitsToDevice->offBmiSrc > pSetDIBitsToDevice->offBmiSrc + pSetDIBitsToDevice->cbBmiSrc || + emr->nSize < pSetDIBitsToDevice->offBmiSrc + pSetDIBitsToDevice->cbBmiSrc || + pSetDIBitsToDevice->offBitsSrc > pSetDIBitsToDevice->offBitsSrc + pSetDIBitsToDevice->cbBitsSrc || + emr->nSize < pSetDIBitsToDevice->offBitsSrc + pSetDIBitsToDevice->cbBitsSrc) + return FALSE; + break; + } + + case EMR_POLYTEXTOUTA: + { + const EMRPOLYTEXTOUTA *pPolyTextOutA = (const EMRPOLYTEXTOUTA *)emr; + int ofs_text = FIELD_OFFSET(EMRPOLYTEXTOUTA, aemrtext); + DWORD i; + if (emr->nSize < ofs_text || + pPolyTextOutA->cStrings * sizeof(EMRTEXT) / sizeof(EMRTEXT) != pPolyTextOutA->cStrings || + ofs_text < ofs_text + pPolyTextOutA->cStrings * sizeof(EMRTEXT) || + emr->nSize < ofs_text + pPolyTextOutA->cStrings * sizeof(EMRTEXT)) + return FALSE; + for (i=0; i < pPolyTextOutA->cStrings; i++) + { + const EMRTEXT *text = &pPolyTextOutA->aemrtext[i]; + DWORD string_ofs, dx_ofs; + string_ofs = text->offString; + if (string_ofs > string_ofs + text->nChars || + emr->nSize < string_ofs + text->nChars) + return FALSE; + dx_ofs = text->offDx; + if (dx_ofs && ( + text->nChars * 4 / 4 != text->nChars || + dx_ofs > dx_ofs + text->nChars * 4 || + emr->nSize < dx_ofs + text->nChars * 4)) + return FALSE; + } + break; + } + + case EMR_POLYTEXTOUTW: + { + const EMRPOLYTEXTOUTW *pPolyTextOutW = (const EMRPOLYTEXTOUTW *)emr; + DWORD ofs_text = FIELD_OFFSET(EMRPOLYTEXTOUTW, aemrtext); + DWORD i; + if (emr->nSize < ofs_text || + pPolyTextOutW->cStrings * sizeof(EMRTEXT) / sizeof(EMRTEXT) != pPolyTextOutW->cStrings || + ofs_text < ofs_text + pPolyTextOutW->cStrings * sizeof(EMRTEXT) || + emr->nSize < ofs_text + pPolyTextOutW->cStrings * sizeof(EMRTEXT)) + return FALSE; + for (i=0; i < pPolyTextOutW->cStrings; i++) + { + const EMRTEXT *text = &pPolyTextOutW->aemrtext[i]; + DWORD string_ofs, dx_ofs; + string_ofs = text->offString; + if (text->nChars * 2 / 2 != text->nChars || + string_ofs > string_ofs + text->nChars * 2 || + emr->nSize < string_ofs + text->nChars * 2) + return FALSE; + dx_ofs = text->offDx; + if (dx_ofs && ( + text->nChars * 4 / 4 != text->nChars || + dx_ofs > dx_ofs + text->nChars * 4 || + emr->nSize < dx_ofs + text->nChars * 4)) + return FALSE; + } + break; + } + + case EMR_FILLRGN: + { + const EMRFILLRGN *pFillRgn = (const EMRFILLRGN *)emr; + DWORD ofs_data = FIELD_OFFSET(EMRFILLRGN, RgnData); + if (emr->nSize < ofs_data || + ofs_data > ofs_data + pFillRgn->cbRgnData || + emr->nSize < ofs_data + pFillRgn->cbRgnData) + return FALSE; + break; + } + + case EMR_FRAMERGN: + { + const EMRFRAMERGN *pFrameRgn = (const EMRFRAMERGN *)emr; + DWORD ofs_data = FIELD_OFFSET(EMRFRAMERGN, RgnData); + if (emr->nSize < ofs_data || + ofs_data > ofs_data + pFrameRgn->cbRgnData || + emr->nSize < ofs_data + pFrameRgn->cbRgnData) + return FALSE; + break; + } + + case EMR_INVERTRGN: + case EMR_PAINTRGN: + { + const EMRINVERTRGN *pInvertRgn = (const EMRINVERTRGN *)emr; + DWORD ofs_data = FIELD_OFFSET(EMRINVERTRGN, RgnData); + if (emr->nSize < ofs_data || + ofs_data > ofs_data + pInvertRgn->cbRgnData || + emr->nSize < ofs_data + pInvertRgn->cbRgnData) + return FALSE; + break; + } + + case EMR_SETTEXTJUSTIFICATION: + { + if (emr->nSize < sizeof(EMRSETTEXTJUSTIFICATION)) return FALSE; + break; + } + + case EMR_SETLAYOUT: + { + if (emr->nSize < sizeof(EMRSETLAYOUT)) return FALSE; + break; + } + + case EMR_GRADIENTFILL: + { + EMRGRADIENTFILL *grad = (EMRGRADIENTFILL *)emr; + DWORD vertex_ofs, mesh_item_size, mesh_ofs; + vertex_ofs = FIELD_OFFSET(EMRGRADIENTFILL, Ver); + if (emr->nSize < vertex_ofs) return FALSE; + + mesh_ofs = vertex_ofs + grad->nVer * sizeof(TRIVERTEX); + if (grad->nVer * sizeof(TRIVERTEX) / sizeof(TRIVERTEX) != grad->nVer || + vertex_ofs > mesh_ofs || + emr->nSize < mesh_ofs) + return FALSE; + + if (grad->ulMode == GRADIENT_FILL_TRIANGLE) + mesh_item_size = sizeof(GRADIENT_TRIANGLE); + else + mesh_item_size = sizeof(GRADIENT_RECT); + + if (grad->nTri * mesh_item_size / mesh_item_size != grad->nTri || + mesh_ofs > mesh_ofs + grad->nTri * mesh_item_size || + emr->nSize < mesh_ofs + grad->nTri * mesh_item_size) + return FALSE; + + break; + } + + default: + break; + } + + return TRUE; +} /***************************************************************************** * PlayEnhMetaFileRecord (GDI32.@) @@ -774,6 +1372,12 @@ BOOL WINAPI PlayEnhMetaFileRecord( hdc, handletable, mr, handles); if (!mr) return FALSE; + if (!emr_validate_size(mr)) + { + ERR("record has insufficient size\n"); + return FALSE; + } + type = mr->iType; TRACE("record %s\n", get_emr_name(type)); @@ -2478,6 +3082,12 @@ BOOL WINAPI EnumEnhMetaFile( break; } + if (!emr_validate_size(emr)) + { + ERR("record has insufficient size\n"); + break; + } + /* In Win9x mode we update the xform if the record will produce output */ if (hdc && IS_WIN9X() && emr_produces_output(emr->iType)) EMF_Update_MF_Xform(hdc, info); -- 2.14.1

2 1

[PATCH] version: Return ERROR_FILE_NOT_FOUND for Win 9X when a file was not found in GetFileVersionInfoSize.
by Alistair Leslie-Hughes 17 May '18

17 May '18

From: Michael Müller <michael(a)fds-team.de> Windows 9x doesnt have function GetFileVersionInfoSizeExA/W however is does have function GetFileVersionInfoSizeA/W. Since all the GetFileVersionInfoSize* functions go though GetFileVersionInfoSizeExW, this seems the best position for the code. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/version/version.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 13436ca..f33361b 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -705,7 +705,12 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h return (len * 2) + 4; default: - SetLastError( lzfd == HFILE_ERROR ? ofs.nErrCode : ERROR_RESOURCE_DATA_NOT_FOUND ); + if (lzfd == HFILE_ERROR) + SetLastError(ofs.nErrCode); + else if (GetVersion() & 0x80000000) /* Windows 95/98 */ + SetLastError(ERROR_FILE_NOT_FOUND); + else + SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); return 0; } } -- 1.9.1

1 0

[PATCH] shell32: Create Microsoft\Windows\Themes directory during Wineprefix creation.
by Alistair Leslie-Hughes 17 May '18

17 May '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Fixes: https://bugs.winehq.org/show_bug.cgi?id=34910 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shellpath.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e14f533..bd07574 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -857,6 +857,7 @@ static const WCHAR Microsoft_Windows_Start_Menu_Admin_ToolsW[] = {'M','i','c','r static const WCHAR Microsoft_Windows_Start_Menu_StartupW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','S','t','a','r','t','U','p','\0'}; static const WCHAR Microsoft_Windows_TemplatesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','T','e','m','p','l','a','t','e','s',0}; static const WCHAR Microsoft_Windows_Temporary_Internet_FilesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','T','e','m','p','o','r','a','r','y',' ','I','n','t','e','r','n','e','t',' ','F','i','l','e','s',0}; +static const WCHAR Microsoft_Windows_ThemesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','T','h','e','m','e','s',0}; static const WCHAR MoviesW[] = {'M','o','v','i','e','s','\0'}; static const WCHAR MusicW[] = {'M','u','s','i','c','\0'}; static const WCHAR MusicLibraryW[] = {'M','u','s','i','c','L','i','b','r','a','r','y',0}; @@ -4267,6 +4268,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) }; WCHAR userShellFolderPath[MAX_PATH], shellFolderPath[MAX_PATH]; LPCWSTR pUserShellFolderPath, pShellFolderPath; + WCHAR path[MAX_PATH]; HRESULT hr = S_OK; HKEY hRootKey; HANDLE hToken; @@ -4295,6 +4297,13 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) hr = _SHRegisterFolders(hRootKey, hToken, pUserShellFolderPath, pShellFolderPath, folders, ARRAY_SIZE(folders)); + + if (SUCCEEDED(hr)) + { + hr = SHGetFolderPathAndSubDirW(0, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_DEFAULT, Microsoft_Windows_ThemesW, path); + } + TRACE("returning 0x%08x\n", hr); return hr; } -- 1.9.1

1 0

[PATCH] d2d1: Add d2d1_1.idl for drawing ID2D1Bitmap1
by Alistair Leslie-Hughes 17 May '18

17 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/d2d1_1.idl | 523 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/dcommon.idl | 15 ++ 2 files changed, 538 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1fbbb30..254b73e 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -17,7 +17,17 @@ */ import "d2d1.idl"; +import "dxgi.idl"; +interface IWICImagingFactory; +interface IWICColorContext; +interface IPrintDocumentPackageTarget; +interface ID2D1PrintControl; +interface ID2D1ColorContext; +interface ID2D1Bitmap1; +interface ID2D1CommandSink; +interface ID2D1Effect; +interface ID2D1ImageBrush; interface ID2D1Device; interface ID2D1StrokeStyle1; interface ID2D1PathGeometry1; @@ -50,6 +60,105 @@ typedef enum D2D1_UNIT_MODE D2D1_UNIT_MODE_FORCE_DWORD = 0xffffffff, } D2D1_UNIT_MODE; +typedef enum D2D1_DEVICE_CONTEXT_OPTIONS +{ + D2D1_DEVICE_CONTEXT_OPTIONS_NONE = 0, + D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS = 1, + D2D1_DEVICE_CONTEXT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_DEVICE_CONTEXT_OPTIONS; + +typedef enum D2D1_PRINT_FONT_SUBSET_MODE +{ + D2D1_PRINT_FONT_SUBSET_DEFAULT = 0, + D2D1_PRINT_FONT_SUBSET_EACHPAGE = 1, + D2D1_PRINT_FONT_SUBSET_NONE = 2, + D2D1_PRINT_FONT_SUBSET_FORCE_DWORD = 0xffffffff, +} D2D1_PRINT_FONT_SUBSET_MODE; + +typedef enum D2D1_COLOR_SPACE +{ + D2D1_COLOR_SPACE_CUSTOM = 0, + D2D1_COLOR_SPACE_SRGB = 1, + D2D1_COLOR_SPACE_SCRGB = 2, + D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_SPACE; + +typedef enum D2D1_BITMAP_OPTIONS +{ + D2D1_BITMAP_OPTIONS_NONE = 0, + D2D1_BITMAP_OPTIONS_TARGET = 1, + D2D1_BITMAP_OPTIONS_CANNOT_DRAW = 2, + D2D1_BITMAP_OPTIONS_CPU_READ = 4, + D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE = 8, + D2D1_BITMAP_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_BITMAP_OPTIONS; + +typedef enum D2D1_INTERPOLATION_MODE +{ + D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR, + D2D1_INTERPOLATION_MODE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR, + D2D1_INTERPOLATION_MODE_CUBIC = D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC, + D2D1_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR, + D2D1_INTERPOLATION_MODE_ANISOTROPIC = D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC, + D2D1_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC, + D2D1_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_INTERPOLATION_MODE; + +typedef enum D2D1_BUFFER_PRECISION +{ + D2D1_BUFFER_PRECISION_UNKNOWN = 0, + D2D1_BUFFER_PRECISION_8BPC_UNORM = 1, + D2D1_BUFFER_PRECISION_8BPC_UNORM_SRGB = 2, + D2D1_BUFFER_PRECISION_16BPC_UNORM = 3, + D2D1_BUFFER_PRECISION_16BPC_FLOAT = 4, + D2D1_BUFFER_PRECISION_32BPC_FLOAT = 5, + D2D1_BUFFER_PRECISION_FORCE_DWORD = 0xffffffff, +} D2D1_BUFFER_PRECISION; + +typedef enum D2D1_COLOR_INTERPOLATION_MODE +{ + D2D1_COLOR_INTERPOLATION_MODE_STRAIGHT = 0, + D2D1_COLOR_INTERPOLATION_MODE_PREMULTIPLIED = 1, + D2D1_COLOR_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_INTERPOLATION_MODE; + +typedef enum D2D1_COMPOSITE_MODE +{ + D2D1_COMPOSITE_MODE_SOURCE_OVER = 0, + D2D1_COMPOSITE_MODE_DESTINATION_OVER = 1, + D2D1_COMPOSITE_MODE_SOURCE_IN = 2, + D2D1_COMPOSITE_MODE_DESTINATION_IN = 3, + D2D1_COMPOSITE_MODE_SOURCE_OUT = 4, + D2D1_COMPOSITE_MODE_DESTINATION_OUT = 5, + D2D1_COMPOSITE_MODE_SOURCE_ATOP = 6, + D2D1_COMPOSITE_MODE_DESTINATION_ATOP = 7, + D2D1_COMPOSITE_MODE_XOR = 8, + D2D1_COMPOSITE_MODE_PLUS = 9, + D2D1_COMPOSITE_MODE_SOURCE_COPY = 10, + D2D1_COMPOSITE_MODE_BOUNDED_SOURCE_COPY = 11, + D2D1_COMPOSITE_MODE_MASK_INVERT = 12, + D2D1_COMPOSITE_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COMPOSITE_MODE; + +typedef enum D2D1_LAYER_OPTIONS1 +{ + D2D1_LAYER_OPTIONS1_NONE = 0, + D2D1_LAYER_OPTIONS1_INITIALIZE_FROM_BACKGROUND = 1, + D2D1_LAYER_OPTIONS1_IGNORE_ALPHA = 2, + D2D1_LAYER_OPTIONS1_FORCE_DWORD = 0xffffffff, +} D2D1_LAYER_OPTIONS1; + +typedef enum D2D1_MAP_OPTIONS +{ + D2D1_MAP_OPTIONS_NONE = 0, + D2D1_MAP_OPTIONS_READ = 1, + D2D1_MAP_OPTIONS_WRITE = 2, + D2D1_MAP_OPTIONS_DISCARD = 4, + D2D1_MAP_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_MAP_OPTIONS; + +typedef D2D_MATRIX_4X4_F D2D1_MATRIX_4X4_F; +typedef struct DWRITE_GLYPH_RUN_DESCRIPTION DWRITE_GLYPH_RUN_DESCRIPTION; typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; typedef struct D2D1_STROKE_STYLE_PROPERTIES1 @@ -75,6 +184,76 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 D2D1_UNIT_MODE unitMode; } D2D1_DRAWING_STATE_DESCRIPTION1; +typedef struct D2D1_MAPPED_RECT +{ + UINT32 pitch; + BYTE *bits; +} D2D1_MAPPED_RECT; + +typedef struct D2D1_LAYER_PARAMETERS1 +{ + D2D1_RECT_F contentBounds; + ID2D1Geometry *geometricMask; + D2D1_ANTIALIAS_MODE maskAntialiasMode; + D2D1_MATRIX_3X2_F maskTransform; + float opacity; + ID2D1Brush *opacityBrush; + D2D1_LAYER_OPTIONS1 layerOptions; +} D2D1_LAYER_PARAMETERS1; + +typedef struct D2D1_RENDERING_CONTROLS +{ + D2D1_BUFFER_PRECISION bufferPrecision; + D2D1_SIZE_U tileSize; +} D2D1_RENDERING_CONTROLS; + +typedef struct D2D1_EFFECT_INPUT_DESCRIPTION +{ + ID2D1Effect *effect; + UINT32 inputIndex; + D2D1_RECT_F inputRectangle; +} D2D1_EFFECT_INPUT_DESCRIPTION; + +typedef struct D2D1_IMAGE_BRUSH_PROPERTIES +{ + D2D1_RECT_F sourceRectangle; + D2D1_EXTEND_MODE extendModeX; + D2D1_EXTEND_MODE extendModeY; + D2D1_INTERPOLATION_MODE interpolationMode; +} D2D1_IMAGE_BRUSH_PROPERTIES; + +typedef struct D2D1_BITMAP_BRUSH_PROPERTIES1 +{ + D2D1_EXTEND_MODE extendModeX; + D2D1_EXTEND_MODE extendModeY; + D2D1_INTERPOLATION_MODE interpolationMode; +} D2D1_BITMAP_BRUSH_PROPERTIES1; + +typedef struct D2D1_BITMAP_PROPERTIES1 +{ + D2D1_PIXEL_FORMAT pixelFormat; + float dpiX; + float dpiY; + D2D1_BITMAP_OPTIONS bitmapOptions; + ID2D1ColorContext *colorContext; +} D2D1_BITMAP_PROPERTIES1; + +typedef struct D2D1_PRINT_CONTROL_PROPERTIES +{ + D2D1_PRINT_FONT_SUBSET_MODE fontSubset; + float rasterDPI; + D2D1_COLOR_SPACE colorSpace; +} D2D1_PRINT_CONTROL_PROPERTIES; + +typedef struct D2D1_POINT_DESCRIPTION +{ + D2D1_POINT_2F point; + D2D1_POINT_2F unitTangentVector; + UINT32 endSegment; + UINT32 endFigure; + float lengthToEndSegment; +} D2D1_POINT_DESCRIPTION; + typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [ @@ -134,3 +313,347 @@ interface ID2D1Factory1 : ID2D1Factory [out] ID2D1Properties **props ); } + +[ + local, + object, + uuid(a898a84c-3873-4588-b08b-ebbf978df041) +] +interface ID2D1Bitmap1 : ID2D1Bitmap +{ + void GetColorContext( + [out] ID2D1ColorContext **color_context + ); + D2D1_BITMAP_OPTIONS GetOptions(); + HRESULT GetSurface( + [out] IDXGISurface **surface + ); + HRESULT Map( + [in] D2D1_MAP_OPTIONS options, + [out] D2D1_MAPPED_RECT *mapped_rect + ); + HRESULT Unmap(); +} + +[ + local, + object, + uuid(ae1572f4-5dd0-4777-998b-9279472ae63b) +] +interface ID2D1GradientStopCollection1 : ID2D1GradientStopCollection +{ + void GetGradientStops1( + [out] D2D1_GRADIENT_STOP *stops, + [in] UINT32 stop_count + ); + D2D1_COLOR_SPACE GetPreInterpolationSpace(); + D2D1_COLOR_SPACE GetPostInterpolationSpace(); + D2D1_BUFFER_PRECISION GetBufferPrecision(); + D2D1_COLOR_INTERPOLATION_MODE GetColorInterpolationMode(); +} + +[ + local, + object, + uuid(b4f34a19-2383-4d76-94f6-ec343657c3dc) +] +interface ID2D1CommandList : ID2D1Image +{ + HRESULT Stream( + [in] ID2D1CommandSink *sink + ); + HRESULT Close(); +} + +[ + local, + object, + uuid(41343a53-e41a-49a2-91cd-21793bbb62e5) +] +interface ID2D1BitmapBrush1 : ID2D1BitmapBrush +{ + void SetInterpolationMode1( + [in] D2D1_INTERPOLATION_MODE interpolation_mode + ); + D2D1_INTERPOLATION_MODE GetInterpolationMode1(); +} + +[ + local, + object, + uuid(1c4820bb-5771-4518-a581-2fe4dd0ec657) +] +interface ID2D1ColorContext : ID2D1Resource +{ + D2D1_COLOR_SPACE GetColorSpace(); + UINT32 GetProfileSize(); + HRESULT GetProfile( + [out] BYTE *profile, + [in] UINT32 size + ); +} + +[ + local, + object, + uuid(82237326-8111-4f7c-bcf4-b5c1175564fe) +] +interface ID2D1GdiMetafileSink : ID2D1Resource +{ + BOOL ProcessRecord( + [in] DWORD record_type, + [out] const void *data, + [in] DWORD data_size + ); +} + +[ + local, + object, + uuid(2f543dc3-cfc1-4211-864f-cfd91c6f3395) +] +interface ID2D1GdiMetafile : ID2D1Resource +{ + HRESULT Stream( + [in] ID2D1GdiMetafileSink *sink + ); + HRESULT GetBounds( + [out] D2D1_RECT_F *bounds + ); +} + +[ + local, + object, + uuid(10a72a66-e91c-43f4-993f-ddf4b82b0b4a) +] +interface ID2D1StrokeStyle1 : ID2D1StrokeStyle +{ + D2D1_STROKE_TRANSFORM_TYPE GetStrokeTransformType(); +} + +[ + local, + object, + uuid(62baa2d2-ab54-41b7-b872-787e0106a421) +] +interface ID2D1PathGeometry1 : ID2D1PathGeometry +{ + HRESULT ComputePointAndSegmentAtLength( + [in] float length, + [in] UINT32 start_segment, + [in] const D2D1_MATRIX_3X2_F *world_transform, + [in] float tolerance, + [out] D2D1_POINT_DESCRIPTION *desc + ); +} + +[ + local, + object, + uuid(689f1f85-c72e-4e33-8f19-85754efd5ace) +] +interface ID2D1DrawingStateBlock1 : ID2D1DrawingStateBlock +{ + void GetDescription( + [out] D2D1_DRAWING_STATE_DESCRIPTION1 *desc + ); + void SetDescription( + [in] const D2D1_DRAWING_STATE_DESCRIPTION1 *desc + ); +} + +[ + local, + object, + uuid(e8f7fe7a-191c-466d-ad95-975678bda998) +] +interface ID2D1DeviceContext : ID2D1RenderTarget +{ + HRESULT CreateBitmap( + [in] D2D1_SIZE_U size, + [in] const void *src_data, + [in] UINT32 pitch, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateBitmapFromWicBitmap( + [in] IWICBitmapSource *bitmap_source, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateColorContext( + [in] D2D1_COLOR_SPACE space, + [in] const BYTE *profile, + [in] UINT32 profile_size, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromFilename( + [in] const WCHAR *filename, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromWicColorContext( + [in] IWICColorContext *wic_color_context, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateBitmapFromDxgiSurface( + [in] IDXGISurface *surface, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateEffect( + [in] REFCLSID effect_id, + [out] ID2D1Effect **effect + ); + HRESULT CreateGradientStopCollection( + [in] const D2D1_GRADIENT_STOP *stops, + [in] UINT32 stop_count, + [in] D2D1_COLOR_SPACE preinterpolation_space, + [in] D2D1_COLOR_SPACE postinterpolation_space, + [in] D2D1_BUFFER_PRECISION buffer_precision, + [in] D2D1_EXTEND_MODE extend_mode, + [in] D2D1_COLOR_INTERPOLATION_MODE color_interpolation_mode, + [out] ID2D1GradientStopCollection1 **gradient + ); + HRESULT CreateImageBrush( + [in] ID2D1Image *image, + [in] const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, + [in] const D2D1_BRUSH_PROPERTIES *brush_desc, + [out] ID2D1ImageBrush **brush + ); + HRESULT CreateBitmapBrush( + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, + [in] const D2D1_BRUSH_PROPERTIES *brush_desc, + [out] ID2D1BitmapBrush1 **bitmap_brush + ); + HRESULT CreateCommandList( + [out] ID2D1CommandList **command_list + ); + BOOL IsDxgiFormatSupported( + [in] DXGI_FORMAT format + ); + BOOL IsBufferPrecisionSupported( + [in] D2D1_BUFFER_PRECISION buffer_precision + ); + void GetImageLocalBounds( + [in] ID2D1Image *image, + [out] D2D1_RECT_F *local_bounds + ); + HRESULT GetImageWorldBounds( + [in] ID2D1Image *image, + [out] D2D1_RECT_F *world_bounds + ); + HRESULT GetGlyphRunWorldBounds( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] DWRITE_MEASURING_MODE measuring_mode, + [out] D2D1_RECT_F *bounds + ); + void GetDevice( + [out] ID2D1Device **device + ); + void SetTarget( + [in] ID2D1Image *target + ); + void GetTarget( + [out] ID2D1Image **target + ); + void SetRenderingControls( + [in] const D2D1_RENDERING_CONTROLS *rendering_controls + ); + void GetRenderingControls( + [out] D2D1_RENDERING_CONTROLS *rendering_controls + ); + void SetPrimitiveBlend( + [in] D2D1_PRIMITIVE_BLEND primitive_blend + ); + D2D1_PRIMITIVE_BLEND GetPrimitiveBlend(); + void SetUnitMode( + [in] D2D1_UNIT_MODE unit_mode + ); + D2D1_UNIT_MODE GetUnitMode(); + void DrawGlyphRun( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] const DWRITE_GLYPH_RUN_DESCRIPTION *glyph_run_desc, + [in] ID2D1Brush *brush, + [in] DWRITE_MEASURING_MODE measuring_mode + ); + void DrawImage( + [in] ID2D1Image *image, + [in] const D2D1_POINT_2F *target_offset, + [in] const D2D1_RECT_F *image_rect, + [in] D2D1_INTERPOLATION_MODE interpolation_mode, + [in] D2D1_COMPOSITE_MODE composite_mode + ); + void DrawGdiMetafile( + [in] ID2D1GdiMetafile *metafile, + [in] const D2D1_POINT_2F *target_offset + ); + void DrawBitmap( + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_RECT_F *dst_rect, + [in] float opacity, + [in] D2D1_INTERPOLATION_MODE interpolation_mode, + [in] const D2D1_RECT_F *src_rect, + [in] const D2D1_MATRIX_4X4_F *perspective_transform + ); + void PushLayer( + [in] const D2D1_LAYER_PARAMETERS1 *layer_parameters, + [in] ID2D1Layer *layer + ); + HRESULT InvalidateEffectInputRectangle( + [in] ID2D1Effect *effect, + [in] UINT32 input, + [in] const D2D1_RECT_F *input_rect + ); + HRESULT GetEffectInvalidRectangleCount( + [in] ID2D1Effect *effect, + [out] UINT32 *rect_count + ); + HRESULT GetEffectInvalidRectangles( + [in] ID2D1Effect *effect, + [out] D2D1_RECT_F *rectangles, + [in] UINT32 rect_count + ); + HRESULT GetEffectRequiredInputRectangles( + [in] ID2D1Effect *effect, + [in] const D2D1_RECT_F *image_rect, + [in] const D2D1_EFFECT_INPUT_DESCRIPTION *desc, + [out] D2D1_RECT_F *input_rect, + [in] UINT32 input_count + ); + void FillOpacityMask( + [in] ID2D1Bitmap *mask, + [in] ID2D1Brush *brush, + [in] const D2D1_RECT_F *dst_rect, + [in] const D2D1_RECT_F *src_rect + ); +} + +[ + local, + object, + uuid(47dd575d-ac05-4cdd-8049-9b02cd16f44c) +] +interface ID2D1Device : ID2D1Resource +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext **context + ); + HRESULT CreatePrintControl( + [in] IWICImagingFactory *wic_factory, + [in] IPrintDocumentPackageTarget *document_target, + [in] const D2D1_PRINT_CONTROL_PROPERTIES *desc, + [out] ID2D1PrintControl **print_control + ); + void SetMaximumTextureMemory( + [in] UINT64 max_texture_memory + ); + UINT64 GetMaximumTextureMemory(); + HRESULT ClearResources( + [in, defaultvalue(0)] UINT msec_since_use + ); +} diff --git a/include/dcommon.idl b/include/dcommon.idl index db5055d..18f2fbe 100644 --- a/include/dcommon.idl +++ b/include/dcommon.idl @@ -61,3 +61,18 @@ typedef struct D2D_SIZE_U UINT32 width; UINT32 height; } D2D_SIZE_U, D2D1_SIZE_U; + +typedef struct D2D_MATRIX_4X4_F +{ + union + { + struct + { + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; + }; + float m[4][4]; + }; +} D2D_MATRIX_4X4_F; -- 1.9.1

1 0

[resend PATCH 1/3] comctl32/taskdialog: Return TRUE when message is handled.
by Nikolay Sivov 16 May '18

16 May '18

From: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 1ab9e133da..4db487957c 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -558,15 +558,17 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (HIWORD(wParam) == BN_CLICKED) { taskdialog_on_button_click(dialog_info, LOWORD(wParam)); - return TRUE; + break; } - break; + return FALSE; case WM_DESTROY: taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); RemovePropW(hwnd, taskdialog_info_propnameW); break; + default: + return FALSE; } - return FALSE; + return TRUE; } /*********************************************************************** -- 2.17.0

1 2

[PATCH] mp3dmod: Register DMO.
by Zebediah Figura 16 May '18

16 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mp3dmod/mp3dmod.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index fa1cce5..4949780 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -33,6 +33,11 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "initguid.h" +DEFINE_GUID(WMMEDIATYPE_Audio, 0x73647561,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71); +DEFINE_GUID(WMMEDIASUBTYPE_MP3,0x00000055,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71); +DEFINE_GUID(WMMEDIASUBTYPE_PCM,0x00000001,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71); + WINE_DEFAULT_DEBUG_CHANNEL(mp3dmod); static HINSTANCE mp3dmod_instance; @@ -526,6 +531,18 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllRegisterServer(void) { + static const WCHAR nameW[] = {'M','P','3',' ','D','e','c','o','d','e','r',' ','D','M','O',0}; + DMO_PARTIAL_MEDIATYPE in, out; + HRESULT hr; + + in.type = WMMEDIATYPE_Audio; + in.subtype = WMMEDIASUBTYPE_MP3; + out.type = WMMEDIATYPE_Audio; + out.subtype = WMMEDIASUBTYPE_PCM; + hr = DMORegister(nameW, &CLSID_CMP3DecMediaObject, &DMOCATEGORY_AUDIO_DECODER, + 0, 1, &in, 1, &out); + if (FAILED(hr)) return hr; + return __wine_register_resources( mp3dmod_instance ); } @@ -534,5 +551,10 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { + HRESULT hr; + + hr = DMOUnregister(&CLSID_CMP3DecMediaObject, &DMOCATEGORY_AUDIO_DECODER); + if (FAILED(hr)) return hr; + return __wine_unregister_resources( mp3dmod_instance ); } -- 2.7.4

1 0

[PATCH 1/4] schedsvc: Check state of the tasks every 10 seconds.
by Dmitry Timoshkov 16 May '18

16 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 22 +++++++++++++++++----- dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 31 ++++++++++++++++++++++++++++--- 3 files changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 542dfc3701..61771d87b3 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -76,6 +76,23 @@ static CRITICAL_SECTION_DEBUG cs_debug = }; static CRITICAL_SECTION at_job_list_section = { &cs_debug, -1, 0, 0, 0, 0 }; +void check_task_state(void) +{ + struct job_t *job; + + EnterCriticalSection(&at_job_list_section); + + LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) + { + if (job->data.flags & 0x08000000) + FIXME("Terminate(%s): not implemented\n", debugstr_w(job->info.Command)); + else if (job->data.flags & 0x04000000) + FIXME("Run(%s): not implemented\n", debugstr_w(job->info.Command)); + } + + LeaveCriticalSection(&at_job_list_section); +} + static DWORD load_unicode_strings(const char *data, DWORD limit, AT_ENUM *info) { DWORD i, data_size = 0; @@ -340,11 +357,6 @@ void add_job(const WCHAR *name) return; } - if (job->data.flags & 0x08000000) - FIXME("Terminate(%s): not implemented\n", debugstr_w(job->info.Command)); - else if (job->data.flags & 0x04000000) - FIXME("Run(%s): not implemented\n", debugstr_w(job->info.Command)); - EnterCriticalSection(&at_job_list_section); job->name = heap_strdupW(name); job->info.JobId = current_jobid++; diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 215bba003e..df7144431d 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -25,6 +25,7 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; void add_job(const WCHAR *name) DECLSPEC_HIDDEN; void remove_job(const WCHAR *name) DECLSPEC_HIDDEN; +void check_task_state(void) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index f021d63b98..905582daf1 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -40,11 +40,27 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) { static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; WCHAR path[MAX_PATH]; - HANDLE htasks; + HANDLE htasks, timer; + LARGE_INTEGER period; OVERLAPPED ov; TRACE("Starting...\n"); + timer = CreateWaitableTimerW(NULL, FALSE, NULL); + if (timer == NULL) + { + ERR("CreateWaitableTimer failed\n"); + return -1; + } + + /* check the state of the tasks every 10 seconds */ + period.QuadPart = 10 * 1000; + if (!SetWaitableTimer(timer, &period, period.QuadPart, NULL, NULL, FALSE)) + { + ERR("SetWaitableTimer failed\n"); + return -1; + } + GetWindowsDirectoryW(path, MAX_PATH); lstrcatW(path, tasksW); @@ -69,7 +85,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) FILE_NOTIFY_INFORMATION data; WCHAR name_buffer[MAX_PATH]; } info; - HANDLE events[2]; + HANDLE events[3]; DWORD ret; /* the buffer must be DWORD aligned */ @@ -87,10 +103,17 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) events[0] = done_event; events[1] = ov.hEvent; + events[2] = timer; - ret = WaitForMultipleObjects(2, events, FALSE, INFINITE); + ret = WaitForMultipleObjects(3, events, FALSE, INFINITE); if (ret == WAIT_OBJECT_0) break; + if (ret == WAIT_OBJECT_0 + 2) + { + check_task_state(); + continue; + } + info.data.FileName[info.data.FileNameLength/sizeof(WCHAR)] = 0; switch (info.data.Action) @@ -128,6 +151,8 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) } } + CancelWaitableTimer(timer); + CloseHandle(timer); CloseHandle(ov.hEvent); CloseHandle(htasks); -- 2.16.3

2 1

[PATCH 3/3] gdi32: Add bounds checking for DIBs embedded in metafiles.
by Vincent Povirk 16 May '18

16 May '18

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdi32/dib.c | 9 ++++ dlls/gdi32/enhmetafile.c | 136 +++++++++++++++++++++++++++++++++++++++++------ dlls/gdi32/gdi_private.h | 1 + 3 files changed, 131 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index c7dcdb122c2..8d7111dbc2a 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -305,6 +305,15 @@ BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) return TRUE; } +DWORD bitmap_bits_size( const BITMAPINFO * info ) +{ + BITMAPINFOHEADER bmih; + + if (!bitmapinfoheader_from_user_bitmapinfo( &bmih, &info->bmiHeader )) return 0; + + return bmih.biSizeImage; +} + static void *get_pixel_ptr( const BITMAPINFO *info, void *bits, int x, int y ) { const int width = info->bmiHeader.biWidth, height = info->bmiHeader.biHeight; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index c66e382c1d6..d72ba3e8a47 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -743,6 +743,22 @@ static BOOL emr_produces_output(int type) } } +static BOOL emr_validate_bmi(const BITMAPINFO *bmi, DWORD bmi_size, WORD coloruse) +{ + if (bmi_size < 4 || + bmi_size < bmi->bmiHeader.biSize) + return FALSE; + + if (bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER) && + bmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) + return FALSE; + + if (bmi_size < bitmap_info_size( bmi, coloruse )) + return FALSE; + + return TRUE; +} + static BOOL emr_validate_size(const ENHMETARECORD *emr) { switch(emr->iType) { @@ -831,7 +847,9 @@ static BOOL emr_validate_size(const ENHMETARECORD *emr) pPen->elp.elpNumEntries * 4 > pPen->elp.elpNumEntries * 4 + FIELD_OFFSET(EMREXTCREATEPEN, elp.elpStyleEntry) || emr->nSize < pPen->elp.elpNumEntries * 4 + FIELD_OFFSET(EMREXTCREATEPEN, elp.elpStyleEntry)) return FALSE; - /* FIXME: validate DIB size */ + if (!emr_validate_bmi((const BITMAPINFO*)((const BYTE*)emr + pPen->offBmi), pPen->cbBmi, DIB_RGB_COLORS) || + pPen->cbBits < bitmap_bits_size((const BITMAPINFO*)((const BYTE*)emr + pPen->offBmi))) + return FALSE; break; } case EMR_CREATEBRUSHINDIRECT: @@ -894,9 +912,19 @@ static BOOL emr_validate_size(const ENHMETARECORD *emr) break; } case EMR_STRETCHDIBITS: - if (emr->nSize < sizeof(EMRSTRETCHDIBITS)) return FALSE; - /* FIXME: validate DIB size */ + { + const EMRSTRETCHDIBITS *pStretchDIBits = (const EMRSTRETCHDIBITS *)emr; + if (emr->nSize < sizeof(EMRSTRETCHDIBITS) || + pStretchDIBits->offBmiSrc > pStretchDIBits->offBmiSrc + pStretchDIBits->cbBmiSrc || + emr->nSize < pStretchDIBits->offBmiSrc + pStretchDIBits->cbBmiSrc || + pStretchDIBits->offBitsSrc > pStretchDIBits->offBitsSrc + pStretchDIBits->cbBitsSrc || + emr->nSize < pStretchDIBits->offBitsSrc + pStretchDIBits->cbBitsSrc || + !emr_validate_bmi((const BITMAPINFO*)((const BYTE*)emr + pStretchDIBits->offBmiSrc), + pStretchDIBits->cbBmiSrc, pStretchDIBits->iUsageSrc) || + pStretchDIBits->cbBitsSrc < bitmap_bits_size((const BITMAPINFO*)((const BYTE*)emr + pStretchDIBits->offBmiSrc))) + return FALSE; break; + } case EMR_EXTTEXTOUTA: { const EMREXTTEXTOUTA *pExtTextOutA = (const EMREXTTEXTOUTA *)emr; @@ -1154,29 +1182,99 @@ static BOOL emr_validate_size(const ENHMETARECORD *emr) if (emr->nSize < sizeof(EMRRESIZEPALETTE)) return FALSE; break; case EMR_CREATEDIBPATTERNBRUSHPT: - if (emr->nSize < sizeof(EMRCREATEDIBPATTERNBRUSHPT)) return FALSE; - /* FIXME: validate dib size */ + { + const EMRCREATEDIBPATTERNBRUSHPT* pCreate = (const EMRCREATEDIBPATTERNBRUSHPT*)emr; + if (emr->nSize < sizeof(EMRCREATEDIBPATTERNBRUSHPT) || + pCreate->offBmi > pCreate->offBmi + pCreate->cbBmi || + emr->nSize < pCreate->offBmi + pCreate->cbBmi || + pCreate->offBits > pCreate->offBits + pCreate->cbBits || + emr->nSize < pCreate->offBits + pCreate->cbBits || + !emr_validate_bmi((const BITMAPINFO*)((const BYTE*)emr + pCreate->offBmi), + pCreate->cbBmi, pCreate->iUsage) || + pCreate->cbBits < bitmap_bits_size((const BITMAPINFO*)((const BYTE*)emr + pCreate->offBmi))) + return FALSE; break; + } case EMR_CREATEMONOBRUSH: - if (emr->nSize < sizeof(EMRCREATEMONOBRUSH)) return FALSE; - /* FIXME: validate dib size */ + { + const EMRCREATEMONOBRUSH* pCreate = (const EMRCREATEMONOBRUSH*)emr; + if (emr->nSize < sizeof(EMRCREATEMONOBRUSH) || + pCreate->offBmi > pCreate->offBmi + pCreate->cbBmi || + emr->nSize < pCreate->offBmi + pCreate->cbBmi || + pCreate->offBits > pCreate->offBits + pCreate->cbBits || + emr->nSize < pCreate->offBits + pCreate->cbBits || + !emr_validate_bmi((const BITMAPINFO*)((const BYTE*)emr + pCreate->offBmi), + pCreate->cbBmi, pCreate->iUsage) || + pCreate->cbBits < bitmap_bits_size((const BITMAPINFO*)((const BYTE*)emr + pCreate->offBmi))) + return FALSE; break; + } case EMR_BITBLT: + { + const EMRBITBLT* pBlt = (const EMRBITBLT*)emr; if (emr->nSize < sizeof(EMRBITBLT)) return FALSE; - /* FIXME: validate dib size */ + if (pBlt->offBmiSrc && + (pBlt->offBmiSrc > pBlt->offBmiSrc + pBlt->cbBmiSrc || + emr->nSize < pBlt->offBmiSrc + pBlt->cbBmiSrc || + pBlt->offBitsSrc > pBlt->offBitsSrc + pBlt->cbBitsSrc || + emr->nSize < pBlt->offBitsSrc + pBlt->cbBitsSrc || + !emr_validate_bmi((const BITMAPINFO*)((const BYTE*)emr + pBlt->offBmiSrc), + pBlt->cbBmiSrc, pBlt->iUsageSrc) || + pBlt->cbBitsSrc < bitmap_bits_size((const BITMAPINFO*)((const BYTE*)emr + pBlt->offBmiSrc)))) + return FALSE; break; + } case EMR_STRETCHBLT: + { + const EMRSTRETCHBLT* pBlt = (const EMRSTRETCHBLT*)emr; if (emr->nSize < sizeof(EMRSTRETCHBLT)) return FALSE; - /* FIXME: validate dib size */ + if (pBlt->offBmiSrc && + (pBlt->offBmiSrc > pBlt->offBmiSrc + pBlt->cbBmiSrc || + emr->nSize < pBlt->offBmiSrc + pBlt->cbBmiSrc || + pBlt->offBitsSrc > pBlt->offBitsSrc + pBlt->cbBitsSrc || + emr->nSize < pBlt->offBitsSrc + pBlt->cbBitsSrc || + !emr_validate_bmi((const BITMAPINFO*)((const BYTE*)emr + pBlt->offBmiSrc), + pBlt->cbBmiSrc, pBlt->iUsageSrc) || + pBlt->cbBitsSrc < bitmap_bits_size((const BITMAPINFO*)((const BYTE*)emr + pBlt->offBmiSrc)))) + return FALSE; break; + } case EMR_ALPHABLEND: + { + const EMRALPHABLEND* pBlt = (const EMRALPHABLEND*)emr; if (emr->nSize < sizeof(EMRALPHABLEND)) return FALSE; - /* FIXME: validate dib size */ + if (pBlt->offBmiSrc && + (pBlt->offBmiSrc > pBlt->offBmiSrc + pBlt->cbBmiSrc || + emr->nSize < pBlt->offBmiSrc + pBlt->cbBmiSrc || + pBlt->offBitsSrc > pBlt->offBitsSrc + pBlt->cbBitsSrc || + emr->nSize < pBlt->offBitsSrc + pBlt->cbBitsSrc || + !emr_validate_bmi((const BITMAPINFO*)((const BYTE*)emr + pBlt->offBmiSrc), + pBlt->cbBmiSrc, pBlt->iUsageSrc) || + pBlt->cbBitsSrc < bitmap_bits_size((const BITMAPINFO*)((const BYTE*)emr + pBlt->offBmiSrc)))) + return FALSE; break; + } case EMR_MASKBLT: - if (emr->nSize < sizeof(EMRMASKBLT)) return FALSE; - /* FIXME: validate dib size */ + { + const EMRMASKBLT* pBlt = (const EMRMASKBLT*)emr; + if (emr->nSize < sizeof(EMRMASKBLT) || + pBlt->offBmiSrc > pBlt->offBmiSrc + pBlt->cbBmiSrc || + emr->nSize < pBlt->offBmiSrc + pBlt->cbBmiSrc || + pBlt->offBitsSrc > pBlt->offBitsSrc + pBlt->cbBitsSrc || + emr->nSize < pBlt->offBitsSrc + pBlt->cbBitsSrc || + pBlt->offBmiMask > pBlt->offBmiMask + pBlt->cbBmiMask || + emr->nSize < pBlt->offBmiMask + pBlt->cbBmiMask || + pBlt->offBitsMask > pBlt->offBitsMask + pBlt->cbBitsMask || + emr->nSize < pBlt->offBitsMask + pBlt->cbBitsMask || + !emr_validate_bmi((const BITMAPINFO*)((const BYTE*)emr + pBlt->offBmiSrc), + pBlt->cbBmiSrc, pBlt->iUsageSrc) || + pBlt->cbBitsSrc < bitmap_bits_size((const BITMAPINFO*)((const BYTE*)emr + pBlt->offBmiSrc)) || + !emr_validate_bmi((const BITMAPINFO*)((const BYTE*)emr + pBlt->offBmiMask), + pBlt->cbBmiMask, pBlt->iUsageMask) || + pBlt->cbBitsMask < bitmap_bits_size((const BITMAPINFO*)((const BYTE*)emr + pBlt->offBmiMask))) + return FALSE; break; + } case EMR_PLGBLT: { const EMRPLGBLT *pPlgBlt = (const EMRPLGBLT *)emr; @@ -1188,9 +1286,14 @@ static BOOL emr_validate_size(const ENHMETARECORD *emr) pPlgBlt->offBmiMask > pPlgBlt->offBmiMask + pPlgBlt->cbBmiMask || emr->nSize < pPlgBlt->offBmiMask + pPlgBlt->cbBmiMask || pPlgBlt->offBitsMask > pPlgBlt->offBitsMask + pPlgBlt->cbBitsMask || - emr->nSize < pPlgBlt->offBitsMask + pPlgBlt->cbBitsMask) + emr->nSize < pPlgBlt->offBitsMask + pPlgBlt->cbBitsMask || + !emr_validate_bmi((const BITMAPINFO*)((const BYTE*)emr + pPlgBlt->offBmiSrc), + pPlgBlt->cbBmiSrc, pPlgBlt->iUsageSrc) || + pPlgBlt->cbBitsSrc < bitmap_bits_size((const BITMAPINFO*)((const BYTE*)emr + pPlgBlt->offBmiSrc)) || + !emr_validate_bmi((const BITMAPINFO*)((const BYTE*)emr + pPlgBlt->offBmiMask), + pPlgBlt->cbBmiMask, pPlgBlt->iUsageMask) || + pPlgBlt->cbBitsMask < bitmap_bits_size((const BITMAPINFO*)((const BYTE*)emr + pPlgBlt->offBmiMask))) return FALSE; - /* FIXME: validate dib size */ break; } @@ -1201,7 +1304,10 @@ static BOOL emr_validate_size(const ENHMETARECORD *emr) pSetDIBitsToDevice->offBmiSrc > pSetDIBitsToDevice->offBmiSrc + pSetDIBitsToDevice->cbBmiSrc || emr->nSize < pSetDIBitsToDevice->offBmiSrc + pSetDIBitsToDevice->cbBmiSrc || pSetDIBitsToDevice->offBitsSrc > pSetDIBitsToDevice->offBitsSrc + pSetDIBitsToDevice->cbBitsSrc || - emr->nSize < pSetDIBitsToDevice->offBitsSrc + pSetDIBitsToDevice->cbBitsSrc) + emr->nSize < pSetDIBitsToDevice->offBitsSrc + pSetDIBitsToDevice->cbBitsSrc || + !emr_validate_bmi((const BITMAPINFO*)((const BYTE*)emr + pSetDIBitsToDevice->offBmiSrc), + pSetDIBitsToDevice->cbBmiSrc, pSetDIBitsToDevice->iUsageSrc) || + pSetDIBitsToDevice->cbBitsSrc < bitmap_bits_size((const BITMAPINFO*)((const BYTE*)emr + pSetDIBitsToDevice->offBmiSrc))) return FALSE; break; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5b09b848466..e0cddd9075f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -232,6 +232,7 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; +extern DWORD bitmap_bits_size( const BITMAPINFO * info ) DECLSPEC_HIDDEN; extern BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) DECLSPEC_HIDDEN; extern const RGBQUAD *get_default_color_table( int bpp ) DECLSPEC_HIDDEN; extern void fill_default_color_table( BITMAPINFO *info ) DECLSPEC_HIDDEN; -- 2.14.1

1 0

[PATCH 2/3] gdi32: Check DIB size when handling EMR_ALPHABLEND.
by Vincent Povirk 16 May '18

16 May '18

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdi32/enhmetafile.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index d8f72c98718..c66e382c1d6 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2559,12 +2559,26 @@ BOOL WINAPI PlayEnhMetaFileRecord( HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pAlphaBlend->offBmiSrc); void *bits; + DIBSECTION dib; SetGraphicsMode(hdcSrc, GM_ADVANCED); SetWorldTransform(hdcSrc, &pAlphaBlend->xformSrc); hBmp = CreateDIBSection(hdc, pbi, pAlphaBlend->iUsageSrc, &bits, NULL, 0); - memcpy(bits, (const BYTE *)mr + pAlphaBlend->offBitsSrc, pAlphaBlend->cbBitsSrc); + if (!hBmp) + { + WARN("EMR_ALPHABLEND: couldn't create DIB section\n"); + return FALSE; + } + + if (!GetObjectW(hBmp, sizeof(dib), &dib)) + { + ERR("EMR_ALPHABLEND: couldn't get DIB object\n"); + DeleteObject(hBmp); + return FALSE; + } + + memcpy(bits, (const BYTE *)mr + pAlphaBlend->offBitsSrc, min(pAlphaBlend->cbBitsSrc, dib.dsBmih.biSizeImage)); hBmpOld = SelectObject(hdcSrc, hBmp); GdiAlphaBlend(hdc, pAlphaBlend->xDest, pAlphaBlend->yDest, pAlphaBlend->cxDest, pAlphaBlend->cyDest, -- 2.14.1

1 0

[PATCH 5/7] comctl32/taskdialog: Add support for TDF_CAN_BE_MINIMIZED.
by Zhiyi Zhang 16 May '18

16 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 a1947dae04..a0d38051b2 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -541,6 +541,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; template->cdit = desc.control_count; ptr = (char *)(template + 1); -- 2.17.0

1 0

[PATCH 4/7] comctl32/taskdialog: Add support for TDN_HELP.
by Zhiyi Zhang 16 May '18

16 May '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 3 +++ dlls/comctl32/tests/taskdialog.c | 33 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 638cdebc02..a1947dae04 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -622,6 +622,9 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; } return FALSE; + case WM_HELP: + taskdialog_notify(dialog_info, TDN_HELP, 0, 0); + break; case WM_DESTROY: taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); RemovePropW(hwnd, taskdialog_info_propnameW); diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 3fcc634e07..ad455554b2 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -121,6 +121,26 @@ static const struct message_info msg_return_press_custom10[] = { 0 } }; +static const struct message_info msg_send_click_ok[] = +{ + { TDM_CLICK_BUTTON, IDOK, 0 }, + { 0 } +}; + +static const struct message_info msg_send_f1[] = +{ + { WM_KEYF1, 0, 0, 0}, + { 0 } +}; + +static const struct message_info msg_got_tdn_help[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_send_f1 }, + { TDN_HELP, 0, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -291,6 +311,18 @@ static void test_buttons(void) run_test(&info, ID_START_BUTTON + 3, msg_return_press_custom4, "default button: valid default - 2"); } +static void test_help(void) +{ + TASKDIALOGCONFIG info = {0}; + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc; + info.lpCallbackData = test_ref_data; + info.dwCommonButtons = TDCBF_OK_BUTTON; + + run_test(&info, IDOK, msg_got_tdn_help, "send f1"); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -327,6 +359,7 @@ START_TEST(taskdialog) test_invalid_parameters(); test_callback(); test_buttons(); + test_help(); unload_v6_module(ctx_cookie, hCtx); } -- 2.17.0

1 0

[PATCH 3/7] comctl32/taskdialog: Return TRUE when message is handled.
by Zhiyi Zhang 16 May '18

16 May '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 4fdea1e889..638cdebc02 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -619,15 +619,17 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (HIWORD(wParam) == BN_CLICKED) { taskdialog_on_button_click(dialog_info, LOWORD(wParam)); - return TRUE; + break; } - break; + return FALSE; case WM_DESTROY: taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); RemovePropW(hwnd, taskdialog_info_propnameW); break; + default: + return FALSE; } - return FALSE; + return TRUE; } /*********************************************************************** -- 2.17.0

1 0

[PATCH] mshtml.idl: Added IHTMLCSSStyleDeclaration declaration.
by Jacek Caban 16 May '18

16 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 391 +++++++++++++++++- include/mshtml.idl | 1145 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1535 insertions(+), 1 deletion(-)

1 0

[PATCH v2 1/7] d3d11/tests: Add test for sampleinfo instruction.
by Józef Kucia 16 May '18

16 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Correctly check for multisample support. --- dlls/d3d11/tests/d3d11.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9c12a768e20c..de2378f90b0b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -19826,6 +19826,144 @@ static void test_sm5_bufinfo_instruction(void) release_test_context(&test_context); } +static void test_sampleinfo_instruction(void) +{ + ID3D11Texture2D *float_rt_texture, *uint_rt_texture; + ID3D11RenderTargetView *float_rtv, *uint_rtv; + struct d3d11_test_context test_context; + ID3D11PixelShader *ps_float, *ps_uint; + unsigned int sample_count, quality; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11RenderTargetView *rtvs[2]; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + struct uvec4 expected_uint; + struct vec4 expected_float; + ID3D11Resource *texture; + ID3D11Device *device; + HRESULT hr; + + static const DWORD ps_uint_code[] = + { +#if 0 + Texture2DMS<float> t; + + uint4 main() : SV_Target1 + { + uint width, height, sample_count; + t.GetDimensions(width, height, sample_count); + return sample_count; + } +#endif + 0x43425844, 0x4342ad12, 0x19addd8c, 0x5cb87c48, 0xe604a242, 0x00000001, 0x000000d4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000001, 0x00000000, 0x00000001, 0x00000001, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000005c, 0x00000050, 0x00000017, + 0x0100086a, 0x04002058, 0x00107000, 0x00000000, 0x00005555, 0x03000065, 0x001020f2, 0x00000001, + 0x02000068, 0x00000001, 0x0500086f, 0x00100012, 0x00000000, 0x0010700a, 0x00000000, 0x05000036, + 0x001020f2, 0x00000001, 0x00100006, 0x00000000, 0x0100003e, + }; + static const DWORD ps_float_code[] = + { +#if 0 + Texture2DMS<float> t; + + float4 main() : SV_Target + { + uint width, height, sample_count; + t.GetDimensions(width, height, sample_count); + return sample_count; + } +#endif + 0x43425844, 0x2b8aea46, 0x34ceda6f, 0xf98d222b, 0x235ebc0b, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000040, 0x00000050, 0x00000010, + 0x0100086a, 0x04002058, 0x00107000, 0x00000000, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, + 0x0500006f, 0x001020f2, 0x00000000, 0x0010700a, 0x00000000, 0x0100003e, + }; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 64; + texture_desc.Height = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &float_rt_texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)float_rt_texture, NULL, &float_rtv); + ok(hr == S_OK, "Failed to create rendertarget view, hr %#x.\n", hr); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &uint_rt_texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)uint_rt_texture, NULL, &uint_rtv); + ok(hr == S_OK, "Failed to create rendertarget view, hr %#x.\n", hr); + + rtvs[0] = float_rtv; + rtvs[1] = uint_rtv; + ID3D11DeviceContext_OMSetRenderTargets(context, ARRAY_SIZE(rtvs), rtvs, NULL); + + hr = ID3D11Device_CreatePixelShader(device, ps_float_code, sizeof(ps_float_code), NULL, &ps_float); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_uint_code, sizeof(ps_uint_code), NULL, &ps_uint); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + for (sample_count = 2; sample_count <= 8; sample_count *= 2) + { + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = sample_count; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; + + hr = ID3D11Device_CheckMultisampleQualityLevels(device, texture_desc.Format, sample_count, &quality); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!quality) + { + skip("Sample count %u not supported.\n", sample_count); + continue; + } + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&texture); + ok(hr == S_OK, "Failed to create texture, hr %#x, sample count %u.\n", hr, sample_count); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + + ID3D11DeviceContext_PSSetShader(context, ps_float, NULL, 0); + draw_quad(&test_context); + ID3D11DeviceContext_PSSetShader(context, ps_uint, NULL, 0); + draw_quad(&test_context); + + expected_float.x = expected_float.y = expected_float.z = expected_float.w = sample_count; + check_texture_vec4(float_rt_texture, &expected_float, 0); + expected_uint.x = expected_uint.y = expected_uint.z = expected_uint.w = sample_count; + check_texture_uvec4(uint_rt_texture, &expected_uint); + + ID3D11Resource_Release(texture); + ID3D11ShaderResourceView_Release(srv); + } + + ID3D11RenderTargetView_Release(float_rtv); + ID3D11RenderTargetView_Release(uint_rtv); + ID3D11Texture2D_Release(float_rt_texture); + ID3D11Texture2D_Release(uint_rt_texture); + ID3D11PixelShader_Release(ps_float); + ID3D11PixelShader_Release(ps_uint); + release_test_context(&test_context); +} + static void test_render_target_device_mismatch(void) { struct d3d11_test_context test_context; @@ -26688,6 +26826,7 @@ START_TEST(d3d11) test_primitive_restart(); test_resinfo_instruction(); test_sm5_bufinfo_instruction(); + test_sampleinfo_instruction(); test_render_target_device_mismatch(); test_buffer_srv(); run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, -- 2.16.1

4 14

[PATCH 1/2] d3d11: Partially implement d3d11_immediate_context_CopySubresourceRegion1().
by Pablo Martin 16 May '18

16 May '18

Forwards calls to CopySubresourceRegion ignoring copy flags. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> --- Some remarks: - I changed argument names for consistency with d3d11_immediate_CopySubresourceRegion. - I believe inverse forwarding would be better (CopySubresourceRegion to CopySubresourceRegion1), but I'm initially implementing like this for consistency with UpdateSubresource1. I can invert this and UpdateSubresource1 in a further patch if this is desired. - I'm also not sure about the benefit in the double trace here, but again, doing it like UpdateSubresource1 is doing. dlls/d3d11/device.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5bc5018d63..c0e9b0d3dd 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2606,12 +2606,19 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_FinishCommandList(ID3D1 } static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3D11DeviceContext1 *iface, - ID3D11Resource *resource, UINT subresource, UINT dst_x, UINT dst_y, UINT dst_z, ID3D11Resource *src_resource, - UINT src_subresource, const D3D11_BOX *src_box, UINT flags) + ID3D11Resource *dst_resource, UINT dst_subresource_idx, UINT dst_x, UINT dst_y, UINT dst_z, + ID3D11Resource *src_resource, UINT src_subresource_idx, const D3D11_BOX *src_box, UINT flags) { - FIXME("iface %p, resource %p, subresource %u, dst_x %u, dst_y %u, dst_z %u, src_resource %p, src_subresource %u, " - "src_box %p, flags %#x stub!\n", iface, resource, subresource, dst_x, dst_y, dst_z, src_resource, - src_subresource, src_box, flags); + TRACE("iface %p, dst_resource %p, dst_subresource_idx %u, dst_x %u, dst_y %u, dst_z %u, " + "src_resource %p, src_subresource_idx %u, src_box %p, flags %#x.\n", + iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, + src_resource, src_subresource_idx, src_box, flags); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + d3d11_immediate_context_CopySubresourceRegion(iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, + src_resource, src_subresource_idx, src_box); } static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11DeviceContext1 *iface, -- 2.14.1

4 7

[PATCH v2 resend] d3d11/tests: Add test for depth clip.
by Zebediah Figura 16 May '18

16 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a..e0a660e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26567,6 +26567,79 @@ static void test_multisample_resolve(void) release_test_context(&test_context); } +static void test_depth_clip(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_RASTERIZER_DESC rs_desc; + ID3D11DeviceContext *context; + ID3D11DepthStencilView *dsv; + ID3D11RasterizerState *rs; + ID3D11Texture2D *texture; + ID3D11Device *device; + unsigned int count; + D3D11_VIEWPORT vp; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, dsv); + + count = 1; + ID3D11DeviceContext_RSGetViewports(context, &count, &vp); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); + check_texture_float(texture, 1.0f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); + check_texture_float(texture, 0.5f, 1); + + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = FALSE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetState(context, rs); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); +todo_wine + check_texture_float(texture, 0.6f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); +todo_wine + check_texture_float(texture, 0.4f, 1); + + ID3D11DepthStencilView_Release(dsv); + ID3D11Texture2D_Release(texture); + ID3D11RasterizerState_Release(rs); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -26704,4 +26777,5 @@ START_TEST(d3d11) test_unbound_multisample_texture(); test_multiple_viewports(); test_multisample_resolve(); + test_depth_clip(); } -- 2.7.4

2 1

wine 3.7 can run VC + visual assist, but wine 3.8 can not.
by xinglp 16 May '18

16 May '18

I'm using archlinux, and WINEARCH=win32 If visual assist uninstalled, VC can run well on both wine 3.7 and wine 3.8. With wine 3.8 and visual assist installed, the VC immediately freezed after launch, no response at all. Also, when I replace /usr/lib32/wine with the same contents of wine 3.7, it became work again. Thanks.

2 1

[PATCH] kernel32: Add SetProcessAffinityUpdateMode stub.
by Gijs Vermeulen 16 May '18

16 May '18

From: Thomas Crider <gloriouseggroll(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Fixes a crash in Dead Rising 4. .../api-ms-win-core-processthreads-l1-1-0.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 7 +++++++ dlls/kernelbase/kernelbase.spec | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index ff13d484f6..154c875f81 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -32,7 +32,7 @@ @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass -@ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index 381db8aa6e..ebbe55fe68 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -43,7 +43,7 @@ @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass -@ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode @ stub SetProcessMitigationPolicy @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index fc2feecdb0..db94c2e5e7 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -48,7 +48,7 @@ @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass -@ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode @ stub SetProcessMitigationPolicy @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e78c1ca8ab..9ed5dfbccf 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1425,7 +1425,7 @@ @ stdcall SetNamedPipeHandleState(long ptr ptr ptr) @ stdcall SetPriorityClass(long long) @ stdcall SetProcessAffinityMask(long long) -# @ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessAffinityUpdateMode(long long) @ stdcall SetProcessDEPPolicy(long) # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index df3426b30b..baa6ec8afe 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3650,6 +3650,13 @@ cleanup: return !status; } +BOOL WINAPI SetProcessAffinityUpdateMode(HANDLE hProcess, DWORD flags) +{ + FIXME("(%p,0x%08x): stub\n", hProcess, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /*********************************************************************** * K32GetProcessImageFileNameA (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8cac67f0db..fb7fafe47b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1452,7 +1452,7 @@ @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) advapi32.SetPrivateObjectSecurity @ stub SetPrivateObjectSecurityEx -@ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode # @ stub SetProcessDefaultCpuSets # @ stub SetProcessGroupAffinity # @ stub SetProcessInformation -- 2.13.6

2 2

[PATCH] ddraw: Silence noisy FIXME about unimplemented D3DPROCESSVERTICES_UPDATEEXTENTS.
by Gijs Vermeulen 16 May '18

16 May '18

From: Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Fixes noisy fixme that floods the console (> 1000) in VENOM. CODENAME: OUTBREAK. dlls/ddraw/executebuffer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index b20b9eda71..d8b4b39fd4 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -308,7 +308,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, ci->wStart, ci->wDest, ci->dwCount, ci->dwFlags); if (ci->dwFlags & D3DPROCESSVERTICES_UPDATEEXTENTS) - FIXME("D3DPROCESSVERTICES_UPDATEEXTENTS not implemented.\n"); + { + static int once; + if (!once++) FIXME("D3DPROCESSVERTICES_UPDATEEXTENTS not implemented.\n"); + } if (ci->dwFlags & D3DPROCESSVERTICES_NOCOLOR) FIXME("D3DPROCESSVERTICES_NOCOLOR not implemented.\n"); -- 2.13.6

2 1

[PATCH] dplayx: Check array index limit first.
by Andrey Gusev 16 May '18

16 May '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dplayx/dplayx_global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 14c53a0c8d..90c3ed8d7e 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -120,7 +120,7 @@ static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size ) /* Find blank area */ uBlockUsed = 0; - while( lpMemArea[ uBlockUsed ].used && uBlockUsed <= dwMaxBlock ) { uBlockUsed++; } + while( uBlockUsed <= dwMaxBlock && lpMemArea[ uBlockUsed ].used ) { uBlockUsed++; } if( uBlockUsed <= dwMaxBlock ) { -- 2.14.3

2 1

[PATCH] ole32: Check array index limit first.
by Andrey Gusev 16 May '18

16 May '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ole32/filemoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 271e5bb8a8..6e3b00e590 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -1382,7 +1382,7 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa } else - if (lstrcmpW(tabStr[i],bkSlash)==0 && i<nb-1 && lstrcmpW(tabStr[i+1],bkSlash)==0){ + if (lstrcmpW(tabStr[i+1],bkSlash)==0 && i<nb-1 && lstrcmpW(tabStr[i],bkSlash)==0){ *tabStr[i]=0; sizeStr--; addBkSlash = FALSE; -- 2.14.3

2 1

[PATCH 4/4] schedsvc: Periodically check state of the running task instances.
by Dmitry Timoshkov 16 May '18

16 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 630e634a8f..c63966bdac 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -172,6 +172,25 @@ void check_task_state(void) update_job_status(job); } } + else if (job->instance_count) + { + DWORD exit_code = STILL_ACTIVE; + + TRACE("checking process %s\n", debugstr_w(job->info.Command)); + + if (job->process[job->instance_count - 1]) + GetExitCodeProcess(job->process[job->instance_count - 1], &exit_code); + + if (exit_code != STILL_ACTIVE) + { + CloseHandle(job->process[job->instance_count - 1]); + job->process[job->instance_count - 1] = NULL; + job->data.exit_code = exit_code; + job->data.status = SCHED_S_TASK_TERMINATED; + job->instance_count--; + update_job_status(job); + } + } } LeaveCriticalSection(&at_job_list_section); -- 2.16.3

1 0

[PATCH 3/4] schedsvc: Add support for running a task.
by Dmitry Timoshkov 16 May '18

16 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 7b3e4979fd..630e634a8f 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -146,7 +146,32 @@ void check_task_state(void) update_job_status(job); } else if (job->data.flags & 0x04000000) - FIXME("Run(%s): not implemented\n", debugstr_w(job->info.Command)); + { + TRACE("running process %s\n", debugstr_w(job->info.Command)); + + if (job->instance_count >= MAX_INSTANCE_COUNT) + ERR("total instance count exceeded %u\n", MAX_INSTANCE_COUNT); + else + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + /* FIXME: also specify the target directory */ + if (CreateProcessW(job->info.Command, NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hThread); + job->process[job->instance_count++] = pi.hProcess; + } + + job->data.exit_code = 0; + job->data.status = SCHED_S_TASK_RUNNING; + job->data.flags &= ~0x04000000; + job->instance_count++; + update_job_status(job); + } + } } LeaveCriticalSection(&at_job_list_section); -- 2.16.3

1 0

[PATCH 2/4] schedsvc: Add support for task termination.
by Dmitry Timoshkov 16 May '18

16 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 61771d87b3..7b3e4979fd 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -55,6 +55,8 @@ typedef struct SYSTEMTIME last_runtime; } FIXDLEN_DATA; +#define MAX_INSTANCE_COUNT 32 + struct job_t { struct list entry; @@ -62,6 +64,7 @@ struct job_t AT_ENUM info; FIXDLEN_DATA data; USHORT instance_count; + HANDLE process[MAX_INSTANCE_COUNT]; }; static LONG current_jobid = 1; @@ -76,16 +79,72 @@ static CRITICAL_SECTION_DEBUG cs_debug = }; static CRITICAL_SECTION at_job_list_section = { &cs_debug, -1, 0, 0, 0, 0 }; +static void update_job_status(struct job_t *job) +{ + HANDLE hfile; + DWORD try, size; + struct + { + UINT exit_code; + UINT status; + UINT flags; + SYSTEMTIME last_runtime; + WORD instance_count; + } state; + + try = 1; + for (;;) + { + hfile = CreateFileW(job->name, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + { + if (try++ >= 3) + { + ERR("Failed to update %s, error %u\n", debugstr_w(job->name), GetLastError()); + return; + } + Sleep(100); + } + } + + if (SetFilePointer(hfile, FIELD_OFFSET(FIXDLEN_DATA, exit_code), NULL, FILE_BEGIN) != INVALID_SET_FILE_POINTER) + { + state.exit_code = job->data.exit_code; + state.status = job->data.status; + state.flags = job->data.flags; + state.last_runtime = job->data.last_runtime; + state.instance_count = job->instance_count; + WriteFile(hfile, &state, sizeof(state), &size, NULL); + } + + CloseHandle(hfile); +} + void check_task_state(void) { struct job_t *job; + WORD i; EnterCriticalSection(&at_job_list_section); LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) { if (job->data.flags & 0x08000000) - FIXME("Terminate(%s): not implemented\n", debugstr_w(job->info.Command)); + { + TRACE("terminating process %s\n", debugstr_w(job->info.Command)); + + for (i = 0; i < job->instance_count; i++) + { + TerminateProcess(job->process[i], 0); + CloseHandle(job->process[i]); + } + + job->data.exit_code = 0; + job->data.status = SCHED_S_TASK_TERMINATED; + job->data.flags &= ~0x08000000; + job->instance_count = 0; + update_job_status(job); + } else if (job->data.flags & 0x04000000) FIXME("Run(%s): not implemented\n", debugstr_w(job->info.Command)); } @@ -339,6 +398,14 @@ static void free_job_info(AT_ENUM *info) static void free_job(struct job_t *job) { + WORD i; + + for (i = 0; i < job->instance_count; i++) + { + TerminateProcess(job->process[i], 0); + CloseHandle(job->process[i]); + } + free_job_info(&job->info); heap_free(job->name); heap_free(job); -- 2.16.3

1 0

[PATCH] testbot: Detect VM revert loops.
by Francois Gouget 16 May '18

16 May '18

VM revert loops typically happen when a VM is misconfigured such that the TestBot fails to access the TestAgent daemon after reverting it. This results in the VM being put offline until it is accessible again through Libvirt which is the case so that it is immediately put back online and reverted again leading to a new error. With this patch the VM is put in maintenance mode for an administrator to look at if it has too many consecutive errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This requires a database upgrade. testbot/bin/LibvirtTool.pl | 30 +++++++++++++++++++++++++----- testbot/ddl/update33.sql | 5 +++++ testbot/ddl/winetestbot.sql | 1 + testbot/doc/winetestbot-schema.dia | 23 +++++++++++++++++++++++ testbot/lib/WineTestBot/Config.pm | 7 +++++-- testbot/lib/WineTestBot/VMs.pm | 1 + testbot/web/admin/VMDetails.pl | 4 +++- 7 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 testbot/ddl/update33.sql diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f9a43bb77..91fe05358 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -193,23 +193,42 @@ sub FatalError($) my ($ErrMessage) = @_; Error $ErrMessage; - # Put the VM offline if nobody else modified its status before us + # Put the VM offline or mark it for maintenance + my $Errors = ($VM->Errors || 0) + 1; + my $NewStatus = $Errors < $MaxVMErrors ? "offline" : "maintenance"; + $VM = CreateVMs()->GetItem($VMKey); - $VM->Status("offline") if ($VM->Status eq $CurrentStatus); - $VM->ChildDeadline(undef); - $VM->ChildPid(undef); + # Put the VM offline if nobody else modified its status before us + if ($VM->Status eq $CurrentStatus) + { + $VM->Status($NewStatus); + $VM->ChildDeadline(undef); + $VM->ChildPid(undef); + $VM->Errors($Errors); + } + else + { + $NewStatus = ""; + } my ($ErrProperty, $SaveErrMessage) = $VM->Save(); if (defined $SaveErrMessage) { LogMsg "Could not put the $VMKey VM offline: $SaveErrMessage ($ErrProperty)\n"; } - elsif ($VM->Status eq "offline") + elsif ($NewStatus eq "offline") { NotifyAdministrator("Putting the $VMKey VM offline", "Could not perform the $Action operation on the $VMKey VM:\n". "\n$ErrMessage\n". "The VM has been put offline and the TestBot will try to regain access to it."); } + elsif ($NewStatus eq "maintenance") + { + NotifyAdministrator("The $VMKey VM needs maintenance", + "Got ". $VM->Errors ." consecutive errors working on the $VMKey VM:\n". + "\n$ErrMessage\n". + "An administrator needs to look at it and to put it back online."); + } exit 1; } @@ -244,6 +263,7 @@ sub ChangeStatus($$;$) $VM->Status($To); if ($Done) { + $VM->Errors(undef) if ($To eq "idle"); $VM->ChildDeadline(undef); $VM->ChildPid(undef); } diff --git a/testbot/ddl/update33.sql b/testbot/ddl/update33.sql new file mode 100644 index 000000000..7239f1dba --- /dev/null +++ b/testbot/ddl/update33.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE VMs + ADD Errors INT(2) NULL + AFTER Status; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 89810ddc0..32eab4e3e 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -49,6 +49,7 @@ CREATE TABLE VMs Type ENUM('win32', 'win64', 'build') NOT NULL, Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance') NOT NULL, + Errors INT(2) NULL, ChildPid INT(5) NULL, ChildDeadline DATETIME NULL, VirtURI VARCHAR(64) NOT NULL, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 61a722a21..2c720f2d2 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2452,6 +2452,29 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Errors#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT(2)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#ChildPid#</dia:string> diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 2eb4f45a8..4f4c8d82a 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -29,7 +29,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM - $VMToolTimeout $MaxTaskTries $AdminEMail $RobotEMail + $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout $TimeoutMargin $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer @@ -43,7 +43,7 @@ require Exporter; @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM - $VMToolTimeout $MaxTaskTries $AdminEMail + $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout $TimeoutMargin $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList @@ -82,6 +82,9 @@ $SleepAfterRevert = 0; # Take into account $WaitForToolsInVM and $SleepAfterRevert $VMToolTimeout = 6 * 60; +# After three consecutive failures to revert a VM, put it in maintenance mode. +$MaxVMErrors = 3; + # How many times to run a test that fails before giving up. $MaxTaskTries = 3; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 9f5a2c78d..a29eebbba 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -667,6 +667,7 @@ my @PropertyDescriptors = ( CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build']), CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), + CreateBasicPropertyDescriptor("Errors", "Errors", !1, !1, "N", 2), CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("ChildDeadline", "Child Deadline", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 93e92763a..057147157 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -40,7 +40,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline)$/); + return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline|Errors)$/); return $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -53,6 +53,8 @@ sub Save($) if ($OldStatus ne $self->{Item}->Status) { + # The administrator action resets the consecutive error count + $self->{Item}->Errors(undef); my ($ErrProperty, $ErrMessage) = $self->{Item}->Validate(); if (!defined $ErrMessage) { -- 2.17.0

1 0

[PATCH] msi/tests: Break out of the loop if both components are found in test_MsiEnumComponentsEx.
by Hans Leidekker 16 May '18

16 May '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/msi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 21a0358aa2..62afa6e747 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -13392,6 +13392,7 @@ static void test_MsiEnumComponentsEx(void) ok( !sid[0], "got \"%s\"\n", sid ); ok( !len, "unexpected length %u\n", len ); found1 = TRUE; + if (found2) break; } if (!strcmp( comp2, guid )) { @@ -13399,6 +13400,7 @@ static void test_MsiEnumComponentsEx(void) ok( sid[0], "empty sid\n" ); ok( len == strlen(sid), "unexpected length %u\n", len ); found2 = TRUE; + if (found1) break; } index++; guid[0] = 0; -- 2.11.0

1 0

[PATCH 1/4] msi: Handle the remote case directly in MsiFormatRecordA().
by Zebediah Figura 16 May '18

16 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/format.c | 59 ++++++++++++++++++++++++++----------------------- dlls/msi/install.c | 23 +++++++++++++++++++ dlls/msi/msipriv.h | 1 + dlls/msi/tests/custom.c | 8 +++---- 4 files changed, 59 insertions(+), 32 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 0533cc0..d34fb2b 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -952,52 +952,55 @@ UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, return r; } -UINT WINAPI MsiFormatRecordA( MSIHANDLE hInstall, MSIHANDLE hRecord, - LPSTR szResult, LPDWORD sz ) +UINT WINAPI MsiFormatRecordA(MSIHANDLE hinst, MSIHANDLE hrec, char *buf, DWORD *sz) { - UINT r; - DWORD len, save; + MSIPACKAGE *package; + MSIRECORD *rec; LPWSTR value; + DWORD len; + UINT r; - TRACE("%d %d %p %p\n", hInstall, hRecord, szResult, sz); + TRACE("%d %d %p %p\n", hinst, hrec, buf, sz); - if (!hRecord) + rec = msihandle2msiinfo(hrec, MSIHANDLETYPE_RECORD); + if (!rec) return ERROR_INVALID_HANDLE; - if (!sz) + package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); + if (!package) { - if (szResult) - return ERROR_INVALID_PARAMETER; - else - return ERROR_SUCCESS; + LPWSTR value = NULL; + MSIHANDLE remote; + + if ((remote = msi_get_remote(hinst))) + { + r = remote_FormatRecord(remote, (struct wire_record *)&rec->count, &value); + + if (!r) + r = msi_strncpyWtoA(value, -1, buf, sz, TRUE); + + midl_user_free(value); + msiobj_release(&rec->hdr); + return r; + } } - r = MsiFormatRecordW( hInstall, hRecord, NULL, &len ); + r = MSI_FormatRecordW(package, rec, NULL, &len); if (r != ERROR_SUCCESS) return r; value = msi_alloc(++len * sizeof(WCHAR)); if (!value) - return ERROR_OUTOFMEMORY; - - r = MsiFormatRecordW( hInstall, hRecord, value, &len ); - if (r != ERROR_SUCCESS) goto done; - save = len + 1; - len = WideCharToMultiByte(CP_ACP, 0, value, len + 1, NULL, 0, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, value, len, szResult, *sz, NULL, NULL); + r = MSI_FormatRecordW(package, rec, value, &len); + if (!r) + r = msi_strncpyWtoA(value, len, buf, sz, FALSE); - if (szResult && len > *sz) - { - if (*sz) szResult[*sz - 1] = '\0'; - r = ERROR_MORE_DATA; - } - - *sz = save - 1; - -done: msi_free(value); +done: + msiobj_release(&rec->hdr); + if (package) msiobj_release(&package->hdr); return r; } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 45c5537..ca277d3 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -168,6 +168,29 @@ UINT msi_strcpy_to_awstring( const WCHAR *str, int len, awstring *awbuf, DWORD * return r; } +UINT msi_strncpyWtoA(const WCHAR *str, int lenW, char *buf, DWORD *sz, BOOL remote) +{ + UINT r = ERROR_SUCCESS; + DWORD lenA; + + if (!sz) + return buf ? ERROR_INVALID_PARAMETER : ERROR_SUCCESS; + + if (lenW < 0) lenW = strlenW(str); + lenA = WideCharToMultiByte(CP_ACP, 0, str, lenW + 1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, str, lenW + 1, buf, *sz, NULL, NULL); + lenA--; + if (buf && lenA >= *sz) + { + if (*sz) buf[*sz - 1] = 0; + r = ERROR_MORE_DATA; + } + if (remote && lenA >= *sz) + lenA *= 2; + *sz = lenA; + return r; +} + const WCHAR *msi_get_target_folder( MSIPACKAGE *package, const WCHAR *name ) { MSIFOLDER *folder = msi_get_loaded_folder( package, name ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 46cbb43..5c6cd40 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1045,6 +1045,7 @@ extern WCHAR *msi_font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR *msi_get_error_message(MSIDATABASE *, int) DECLSPEC_HIDDEN; +extern UINT msi_strncpyWtoA(const WCHAR *str, int len, char *buf, DWORD *sz, BOOL remote) DECLSPEC_HIDDEN; /* media */ diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 04946d9..320aa6f 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -785,28 +785,28 @@ static void test_format_record(MSIHANDLE hinst) sz = 0; r = MsiFormatRecordA(hinst, rec, NULL, &sz); ok(hinst, !r, "got %u\n", r); - todo_wine_ok(hinst, sz == 14, "got size %u\n", sz); + ok(hinst, sz == 14, "got size %u\n", sz); sz = 0; strcpy(buffer,"q"); r = MsiFormatRecordA(hinst, rec, buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 14, "got size %u\n", sz); + ok(hinst, sz == 14, "got size %u\n", sz); sz = 1; strcpy(buffer,"x"); r = MsiFormatRecordA(hinst, rec, buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !buffer[0], "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 14, "got size %u\n", sz); + ok(hinst, sz == 14, "got size %u\n", sz); sz = 7; strcpy(buffer,"x"); r = MsiFormatRecordA(hinst, rec, buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "foo 12"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 14, "got size %u\n", sz); + ok(hinst, sz == 14, "got size %u\n", sz); sz = 8; strcpy(buffer,"x"); -- 2.7.4

3 11

[PATCH] d3d11/tests: Add test for ClearRenderTargetView.
by Pablo Martin 16 May '18

16 May '18

I stumbled upon this testing problem, where the tested colour differs between wine and windows. Tested on ubuntu 17.10 and all windows versions on testbot. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> --- dlls/d3d11/tests/d3d11.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a461..307a966ac3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11581,6 +11581,7 @@ static void test_copy_subresource_region(void) ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + todo_wine check_texture_color(test_context.backbuffer, 0x800000ff, 0); set_box(&box, 0, 0, 0, 2, 2, 1); ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, -- 2.14.1

2 3

[v2 PATCH 1/2] d2d1: Add ID2D1Device stub.
by Nikolay Sivov 15 May '18

15 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: renamed source file. dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/d2d1_private.h | 10 ++ dlls/d2d1/{render_target.c => device.c} | 121 ++++++++++++++++++++++++ dlls/d2d1/factory.c | 14 ++- include/d2d1_1.idl | 61 +++++++++++- 5 files changed, 204 insertions(+), 4 deletions(-) rename dlls/d2d1/{render_target.c => device.c} (97%) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 20d3f26f6f..4bfe3b5953 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -8,12 +8,12 @@ C_SRCS = \ bitmap_render_target.c \ brush.c \ dc_render_target.c \ + device.c \ factory.c \ geometry.c \ hwnd_render_target.c \ layer.c \ mesh.c \ - render_target.c \ state_block.c \ stroke.c \ wic_render_target.c diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index dbfb83c249..21e2b8835a 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -477,6 +477,16 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; +struct d2d_device +{ + ID2D1Device ID2D1Device_iface; + LONG refcount; + ID2D1Factory1 *factory; + IDXGIDevice *dxgi_device; +}; + +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; + static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { size_t new_capacity, max_capacity; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/device.c similarity index 97% rename from dlls/d2d1/render_target.c rename to dlls/d2d1/device.c index 7afbc84ec5..8321b2f6fa 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/device.c @@ -38,6 +38,11 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; +static inline struct d2d_device *impl_from_ID2D1Device(ID2D1Device *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_device, ID2D1Device_iface); +} + static ID2D1Brush *d2d_draw_get_text_brush(struct d2d_draw_text_layout_ctx *context, IUnknown *effect) { ID2D1Brush *brush = NULL; @@ -3289,3 +3294,119 @@ HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *iface, IDXGISurface1 return S_OK; } + +static HRESULT WINAPI d2d_device_QueryInterface(ID2D1Device *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID2D1Device) + || IsEqualGUID(riid, &IID_ID2D1Resource) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID2D1Device_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d2d_device_AddRef(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI d2d_device_Release(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (refcount == 0) + { + IDXGIDevice_Release(device->dxgi_device); + ID2D1Factory1_Release(device->factory); + heap_free(device); + } + + return refcount; +} + +static void WINAPI d2d_device_GetFactory(ID2D1Device *iface, ID2D1Factory **factory) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + *factory = (ID2D1Factory *)device->factory; + ID2D1Factory1_AddRef(device->factory); +} + +static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, + ID2D1DeviceContext **context) +{ + FIXME("iface %p, options %#x, context %p stub!\n", iface, options, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d2d_device_CreatePrintControl(ID2D1Device *iface, IWICImagingFactory *wic_factory, + IPrintDocumentPackageTarget *document_target, const D2D1_PRINT_CONTROL_PROPERTIES *desc, + ID2D1PrintControl **print_control) +{ + FIXME("iface %p, wic_factory %p, document_target %p, desc %p, print_control %p stub!\n", iface, wic_factory, + document_target, desc, print_control); + + return E_NOTIMPL; +} + +static void WINAPI d2d_device_SetMaximumTextureMemory(ID2D1Device *iface, UINT64 max_texture_memory) +{ + FIXME("iface %p, max_texture_memory %s stub!\n", iface, wine_dbgstr_longlong(max_texture_memory)); +} + +static UINT64 WINAPI d2d_device_GetMaximumTextureMemory(ID2D1Device *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT WINAPI d2d_device_ClearResources(ID2D1Device *iface, UINT msec_since_use) +{ + FIXME("iface %p, msec_since_use %u stub!\n", iface, msec_since_use); + + return E_NOTIMPL; +} + +static const struct ID2D1DeviceVtbl d2d_device_vtbl = +{ + d2d_device_QueryInterface, + d2d_device_AddRef, + d2d_device_Release, + d2d_device_GetFactory, + d2d_device_CreateDeviceContext, + d2d_device_CreatePrintControl, + d2d_device_SetMaximumTextureMemory, + d2d_device_GetMaximumTextureMemory, + d2d_device_ClearResources, +}; + +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *iface, IDXGIDevice *dxgi_device) +{ + device->ID2D1Device_iface.lpVtbl = &d2d_device_vtbl; + device->refcount = 1; + device->factory = iface; + ID2D1Factory1_AddRef(device->factory); + device->dxgi_device = dxgi_device; + IDXGIDevice_AddRef(device->dxgi_device); +} diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 9bacc8583c..7810e957d4 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -375,9 +375,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, IDXGIDevice *dxgi_device, ID2D1Device **device) { - FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + struct d2d_device *object; - return E_NOTIMPL; + TRACE("iface %p, dxgi_device %p, device %p.\n", iface, dxgi_device, device); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_device_init(object, iface, dxgi_device); + + TRACE("Create device %p.\n", object); + *device = &object->ID2D1Device_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1fbbb301dd..8f8b40b1d9 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -18,12 +18,22 @@ import "d2d1.idl"; -interface ID2D1Device; +interface ID2D1DeviceContext; interface ID2D1StrokeStyle1; interface ID2D1PathGeometry1; interface ID2D1DrawingStateBlock1; interface ID2D1GdiMetafile; interface ID2D1Properties; +interface IPrintDocumentPackageTarget; +interface ID2D1PrintControl; +interface IWICImagingFactory; + +typedef enum D2D1_DEVICE_CONTEXT_OPTIONS +{ + D2D1_DEVICE_CONTEXT_OPTIONS_NONE = 0, + D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS = 1, + D2D1_DEVICE_CONTEXT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_DEVICE_CONTEXT_OPTIONS; typedef enum D2D1_STROKE_TRANSFORM_TYPE { @@ -77,6 +87,55 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); +typedef enum D2D1_PRINT_FONT_SUBSET_MODE +{ + D2D1_PRINT_FONT_SUBSET_MODE_DEFAULT = 0, + D2D1_PRINT_FONT_SUBSET_MODE_EACHPAGE = 1, + D2D1_PRINT_FONT_SUBSET_MODE_NONE = 2, + D2D1_PRINT_FONT_SUBSET_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_PRINT_FONT_SUBSET_MODE; + +typedef enum D2D1_COLOR_SPACE +{ + D2D1_COLOR_SPACE_CUSTOM = 0, + D2D1_COLOR_SPACE_SRGB = 1, + D2D1_COLOR_SPACE_SCRGB = 2, + D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_SPACE; + +typedef struct D2D1_PRINT_CONTROL_PROPERTIES +{ + D2D1_PRINT_FONT_SUBSET_MODE fontSubset; + FLOAT rasterDPI; + D2D1_COLOR_SPACE colorSpace; +} D2D1_PRINT_CONTROL_PROPERTIES; + +[ + object, + uuid(47dd575d-ac05-4cdd-8049-9b02cd16f44c), + local, +] +interface ID2D1Device : ID2D1Resource +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext **context + ); + HRESULT CreatePrintControl( + [in] IWICImagingFactory *wic_factory, + [in] IPrintDocumentPackageTarget *document_target, + [in] const D2D1_PRINT_CONTROL_PROPERTIES *desc, + [out] ID2D1PrintControl **print_control + ); + void SetMaximumTextureMemory( + [in] UINT64 max_texture_memory + ); + UINT64 GetMaximumTextureMemory(); + HRESULT ClearResources( + [in, defaultvalue(0)] UINT msec_since_use + ); +} + [ object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), -- 2.17.0

1 1

[PATCH] kernel32: Check only the low word of CS when printing exceptions.
by Zebediah Figura 15 May '18

15 May '18

Fixes messages along the lines of wine: Unhandled page fault at address 0xf7bd0023:0x7b43d14c (thread 006c), starting debugger... Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/except.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index e00572f..bff8ce2 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -150,9 +150,9 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in if ((len<0) || (len>=size)) return -1; #ifdef __i386__ - if (ptr->ContextRecord->SegCs != wine_get_cs()) + if (LOWORD(ptr->ContextRecord->SegCs) != wine_get_cs()) len2 = snprintf(buffer+len, size-len, " at address 0x%04x:0x%08x", - ptr->ContextRecord->SegCs, + LOWORD(ptr->ContextRecord->SegCs), (DWORD)ptr->ExceptionRecord->ExceptionAddress); else #endif -- 2.7.4

1 0

[PATCH] dsound: Use IDirectSoundBuffer8 to avoid unnecessary casts
by Alistair Leslie-Hughes 15 May '18

15 May '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/primary.c | 90 +++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 887ee73..c64a6e7 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -513,24 +513,24 @@ out: /******************************************************************************* * PrimaryBuffer */ -static inline IDirectSoundBufferImpl *impl_from_IDirectSoundBuffer(IDirectSoundBuffer *iface) +static inline IDirectSoundBufferImpl *impl_from_IDirectSoundBuffer8(IDirectSoundBuffer8 *iface) { /* IDirectSoundBuffer and IDirectSoundBuffer8 use the same iface. */ return CONTAINING_RECORD(iface, IDirectSoundBufferImpl, IDirectSoundBuffer8_iface); } /* This sets this format for the primary buffer only */ -static HRESULT WINAPI PrimaryBufferImpl_SetFormat(IDirectSoundBuffer *iface, +static HRESULT WINAPI PrimaryBufferImpl_SetFormat(IDirectSoundBuffer8 *iface, const WAVEFORMATEX *wfex) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); TRACE("(%p,%p)\n", iface, wfex); return primarybuffer_SetFormat(This->device, wfex); } -static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer *iface, LONG vol) +static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LONG vol) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; HRESULT hr; float fvol; @@ -589,9 +589,9 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer *iface, LON return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_GetVolume(IDirectSoundBuffer *iface, LONG *vol) +static HRESULT WINAPI PrimaryBufferImpl_GetVolume(IDirectSoundBuffer8 *iface, LONG *vol) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; float fvol; HRESULT hr; @@ -633,9 +633,9 @@ static HRESULT WINAPI PrimaryBufferImpl_GetVolume(IDirectSoundBuffer *iface, LON return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_SetFrequency(IDirectSoundBuffer *iface, DWORD freq) +static HRESULT WINAPI PrimaryBufferImpl_SetFrequency(IDirectSoundBuffer8 *iface, DWORD freq) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); TRACE("(%p,%d)\n",This,freq); /* You cannot set the frequency of the primary buffer */ @@ -643,10 +643,10 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFrequency(IDirectSoundBuffer *iface, return DSERR_CONTROLUNAVAIL; } -static HRESULT WINAPI PrimaryBufferImpl_Play(IDirectSoundBuffer *iface, DWORD reserved1, +static HRESULT WINAPI PrimaryBufferImpl_Play(IDirectSoundBuffer8 *iface, DWORD reserved1, DWORD reserved2, DWORD flags) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%08x,%08x,%08x)\n", iface, reserved1, reserved2, flags); @@ -660,9 +660,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Play(IDirectSoundBuffer *iface, DWORD re return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_Stop(IDirectSoundBuffer *iface) +static HRESULT WINAPI PrimaryBufferImpl_Stop(IDirectSoundBuffer8 *iface) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p)\n", iface); @@ -671,9 +671,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Stop(IDirectSoundBuffer *iface) return DS_OK; } -static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer *iface) +static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer8 *iface) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref - 1); if(ref == 1) @@ -695,9 +695,9 @@ LONG capped_refcount_dec(LONG *out) return ref - 1; } -static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer *iface) +static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer8 *iface) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref; ref = capped_refcount_dec(&This->ref); @@ -709,13 +709,13 @@ static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer *iface) return ref; } -static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer *iface, +static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer8 *iface, DWORD *playpos, DWORD *writepos) { HRESULT hres = DS_OK; UINT32 pad = 0; UINT32 mixpos; - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p,%p)\n", iface, playpos, writepos); @@ -748,9 +748,9 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer *i return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_GetStatus(IDirectSoundBuffer *iface, DWORD *status) +static HRESULT WINAPI PrimaryBufferImpl_GetStatus(IDirectSoundBuffer8 *iface, DWORD *status) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p)\n", iface, status); @@ -768,11 +768,11 @@ static HRESULT WINAPI PrimaryBufferImpl_GetStatus(IDirectSoundBuffer *iface, DWO } -static HRESULT WINAPI PrimaryBufferImpl_GetFormat(IDirectSoundBuffer *iface, WAVEFORMATEX *lpwf, +static HRESULT WINAPI PrimaryBufferImpl_GetFormat(IDirectSoundBuffer8 *iface, WAVEFORMATEX *lpwf, DWORD wfsize, DWORD *wfwritten) { DWORD size; - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p,%d,%p)\n", iface, lpwf, wfsize, wfwritten); @@ -801,12 +801,12 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat(IDirectSoundBuffer *iface, WAV return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer *iface, DWORD writecursor, +static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer8 *iface, DWORD writecursor, DWORD writebytes, void **lplpaudioptr1, DWORD *audiobytes1, void **lplpaudioptr2, DWORD *audiobytes2, DWORD flags) { HRESULT hres; - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%d,%d,%p,%p,%p,%p,0x%08x) at %d\n", iface, @@ -874,9 +874,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer *iface, DWORD wr return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_SetCurrentPosition(IDirectSoundBuffer *iface, DWORD newpos) +static HRESULT WINAPI PrimaryBufferImpl_SetCurrentPosition(IDirectSoundBuffer8 *iface, DWORD newpos) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); TRACE("(%p,%d)\n",This,newpos); /* You cannot set the position of the primary buffer */ @@ -884,9 +884,9 @@ static HRESULT WINAPI PrimaryBufferImpl_SetCurrentPosition(IDirectSoundBuffer *i return DSERR_INVALIDCALL; } -static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer *iface, LONG pan) +static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG pan) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; float fvol; HRESULT hr; @@ -945,9 +945,9 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer *iface, LONG p return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_GetPan(IDirectSoundBuffer *iface, LONG *pan) +static HRESULT WINAPI PrimaryBufferImpl_GetPan(IDirectSoundBuffer8 *iface, LONG *pan) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; float fvol; HRESULT hr; @@ -989,10 +989,10 @@ static HRESULT WINAPI PrimaryBufferImpl_GetPan(IDirectSoundBuffer *iface, LONG * return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer *iface, void *p1, DWORD x1, +static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer8 *iface, void *p1, DWORD x1, void *p2, DWORD x2) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p,%d,%p,%d)\n", iface, p1, x1, p2, x2); @@ -1008,16 +1008,16 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer *iface, void * return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_Restore(IDirectSoundBuffer *iface) +static HRESULT WINAPI PrimaryBufferImpl_Restore(IDirectSoundBuffer8 *iface) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); FIXME("(%p):stub\n",This); return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_GetFrequency(IDirectSoundBuffer *iface, DWORD *freq) +static HRESULT WINAPI PrimaryBufferImpl_GetFrequency(IDirectSoundBuffer8 *iface, DWORD *freq) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p)\n", iface, freq); @@ -1037,17 +1037,17 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFrequency(IDirectSoundBuffer *iface, return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_Initialize(IDirectSoundBuffer *iface, IDirectSound *dsound, +static HRESULT WINAPI PrimaryBufferImpl_Initialize(IDirectSoundBuffer8 *iface, IDirectSound *dsound, const DSBUFFERDESC *dbsd) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); WARN("(%p) already initialized\n", This); return DSERR_ALREADYINITIALIZED; } -static HRESULT WINAPI PrimaryBufferImpl_GetCaps(IDirectSoundBuffer *iface, DSBCAPS *caps) +static HRESULT WINAPI PrimaryBufferImpl_GetCaps(IDirectSoundBuffer8 *iface, DSBCAPS *caps) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p)\n", iface, caps); @@ -1071,10 +1071,10 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCaps(IDirectSoundBuffer *iface, DSBCA return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(IDirectSoundBuffer *iface, REFIID riid, +static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(IDirectSoundBuffer8 *iface, REFIID riid, void **ppobj) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppobj); @@ -1126,7 +1126,7 @@ static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(IDirectSoundBuffer *iface return E_NOINTERFACE; } -static const IDirectSoundBufferVtbl dspbvt = +static const IDirectSoundBuffer8Vtbl dspbvt = { PrimaryBufferImpl_QueryInterface, PrimaryBufferImpl_AddRef, @@ -1176,7 +1176,7 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * dsb->refiks = 0; dsb->numIfaces = 0; dsb->device = device; - dsb->IDirectSoundBuffer8_iface.lpVtbl = (IDirectSoundBuffer8Vtbl *)&dspbvt; + dsb->IDirectSoundBuffer8_iface.lpVtbl = &dspbvt; dsb->IDirectSound3DListener_iface.lpVtbl = &ds3dlvt; dsb->IKsPropertySet_iface.lpVtbl = &iksbvt; dsb->dsbd = *dsbd; -- 1.9.1

2 1

[PATCH] winmm: Fix superfluous MOM_DONE callback messages.
by Akihiro Sagawa 15 May '18

15 May '18

Fix Bug 44974. This is a regression introduced by 185d98bbfdbf7ef10ef52d0264a5a38aedd3b19d. Because midiOutLongMsg's MOM_DONE callback message confuses an application, we don't rely on midiOut callback routine anymore in MIDI stream processing. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 18 ++++++++++++++++-- dlls/winmm/winmm.c | 13 +++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-)

2 1

[PATCH v2] d3d11/tests: Add test for depth clip.
by Zebediah Figura 15 May '18

15 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a..ca6130b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26567,6 +26567,79 @@ static void test_multisample_resolve(void) release_test_context(&test_context); } +static void test_depth_clip(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_RASTERIZER_DESC rs_desc; + ID3D11DeviceContext *context; + ID3D11DepthStencilView *dsv; + ID3D11RasterizerState *rs; + ID3D11Texture2D *texture; + ID3D11Device *device; + unsigned int count; + D3D11_VIEWPORT vp; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, dsv); + + count = 1; + ID3D11DeviceContext_RSGetViewports(context, &count, &vp); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); + check_texture_float(texture, 1.0f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); + check_texture_float(texture, 0.5f, 1); + + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = FALSE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetState(context, rs); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); +todo_wine + check_texture_float(texture, 0.6f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); +todo_wine + check_texture_float(texture, 0.4f, 1); + + ID3D11DepthStencilView_Release(dsv); + ID3D11Texture2D_Release(texture); + ID3D11RasterizerState_Release(rs); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -26704,4 +26777,5 @@ START_TEST(d3d11) test_unbound_multisample_texture(); test_multiple_viewports(); test_multisample_resolve(); + test_depth_clip(); } -- 2.7.4

1 0

[PATCH] d3d11: Return 0 for the class instance count from the shader getters.
by Henri Verbeet 15 May '18

15 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 12 ++++++++++++ dlls/d3d11/tests/d3d11.c | 25 +++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e4d87603df8..5bc5018d634 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1522,6 +1522,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) @@ -1577,6 +1579,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) @@ -1745,6 +1749,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_geometry_shader(device->wined3d_device))) @@ -2187,6 +2193,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_hull_shader(device->wined3d_device))) @@ -2294,6 +2302,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_domain_shader(device->wined3d_device))) @@ -2426,6 +2436,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_compute_shader(device->wined3d_device))) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a4614..9c12a768e20 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9684,6 +9684,7 @@ static void test_clear_state(void) float blend_factor[4]; ID3D11Device *device; BOOL predicate_value; + UINT instance_count; DXGI_FORMAT format; UINT sample_mask; UINT stencil_ref; @@ -9719,8 +9720,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, &instance_count); ok(!tmp_vs, "Got unexpected vertex shader %p.\n", tmp_vs); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_HSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9738,8 +9741,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, &instance_count); ok(!tmp_hs, "Got unexpected hull shader %p.\n", tmp_hs); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_DSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9757,8 +9762,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, &instance_count); ok(!tmp_ds, "Got unexpected domain shader %p.\n", tmp_ds); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_GSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9776,8 +9783,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, &instance_count); ok(!tmp_gs, "Got unexpected geometry shader %p.\n", tmp_gs); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_PSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9796,8 +9805,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, &instance_count); ok(!tmp_ps, "Got unexpected pixel shader %p.\n", tmp_ps); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_CSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9816,8 +9827,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, &instance_count); ok(!tmp_cs, "Got unexpected compute shader %p.\n", tmp_cs); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_CSGetUnorderedAccessViews(context, 0, D3D11_PS_CS_UAV_REGISTER_COUNT, tmp_uav); for (i = 0; i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) { -- 2.11.0

1 0

[PATCH] d2d1/tests: Adjust expected value for linear brush test.
by Józef Kucia 15 May '18

15 May '18

Fixes the test on Linux with Nvidia. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9bd9e2b19d17..f8332946b953 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1754,7 +1754,7 @@ static void test_linear_brush(void) {200, 150, 0xffc03e00}, {240, 150, 0xffffffff}, {280, 150, 0xffffffff}, {320, 150, 0xffffffff}, {240, 180, 0xffffffff}, {280, 180, 0xffff4040}, {320, 180, 0xffff4040}, {380, 180, 0xffffffff}, {200, 210, 0xffffffff}, {240, 210, 0xffa99640}, {280, 210, 0xffb28d40}, {320, 210, 0xffbb8440}, - {360, 210, 0xffc47b40}, {400, 210, 0xffffffff}, {200, 240, 0xffffffff}, {280, 240, 0xff41fd40}, + {360, 210, 0xffc47b40}, {400, 210, 0xffffffff}, {200, 240, 0xffffffff}, {280, 240, 0xff41fe40}, {320, 240, 0xff49f540}, {360, 240, 0xff52ec40}, {440, 240, 0xffffffff}, {240, 270, 0xffffffff}, {280, 270, 0xff408eb0}, {320, 270, 0xff4097a7}, {360, 270, 0xff40a19e}, {440, 270, 0xffffffff}, {280, 300, 0xffffffff}, {320, 300, 0xff4040ff}, {360, 300, 0xff4040ff}, {400, 300, 0xff406ad4}, -- 2.16.1

2 1

[PATCH 1/5] wined3d: Implement sampleinfo instruction.
by Józef Kucia 15 May '18

15 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 43 ++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 3 ++- dlls/wined3d/wined3d_gl.h | 1 + 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c058737165ba..74d4d19d3795 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -162,6 +162,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, {"GL_ARB_shader_image_size", ARB_SHADER_IMAGE_SIZE }, {"GL_ARB_shader_storage_buffer_object", ARB_SHADER_STORAGE_BUFFER_OBJECT}, + {"GL_ARB_shader_texture_image_samples", ARB_SHADER_TEXTURE_IMAGE_SAMPLES}, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shading_language_420pack", ARB_SHADING_LANGUAGE_420PACK }, @@ -3938,6 +3939,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, + {ARB_SHADER_TEXTURE_IMAGE_SAMPLES, MAKEDWORD_VERSION(4, 5)}, {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, {ARB_TEXTURE_FILTER_ANISOTROPIC, MAKEDWORD_VERSION(4, 6)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index eddf35d83a04..40d19d028ffe 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6022,6 +6022,45 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) shader_addline(buffer, ")%s);\n", dst_swizzle); } +static void shader_glsl_sample_info(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + enum wined3d_shader_resource_type resource_type; + enum wined3d_data_type dst_data_type; + unsigned int resource_idx, bind_idx; + char dst_swizzle[6]; + DWORD write_mask; + + if (!gl_info->supported[ARB_SHADER_TEXTURE_IMAGE_SAMPLES]) + { + FIXME("textureSamples() is not supported.\n"); + return; + } + + dst_data_type = ins->dst[0].reg.data_type; + if (ins->flags == WINED3DSI_SAMPLE_INFO_UINT) + dst_data_type = WINED3D_DATA_UINT; + else if (ins->flags) + FIXME("Unhandled flags %#x.\n", ins->flags); + + resource_idx = ins->src[0].reg.idx[0].offset; + resource_type = reg_maps->resource_info[resource_idx].type; + if (resource_type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + return; + } + bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, WINED3D_SAMPLER_DEFAULT); + + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], dst_data_type); + shader_glsl_get_swizzle(&ins->src[0], FALSE, write_mask, dst_swizzle); + shader_addline(buffer, "%s(textureSamples(%s_sampler%u), 0, 0, 0)%s);\n", + dst_data_type == WINED3D_DATA_UINT ? "uvec4" : "vec4", + shader_glsl_get_prefix(reg_maps->shader_version.type), bind_idx, dst_swizzle); +} + static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; @@ -7514,6 +7553,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shader_image_size : enable\n"); if (gl_info->supported[ARB_SHADER_STORAGE_BUFFER_OBJECT]) shader_addline(buffer, "#extension GL_ARB_shader_storage_buffer_object : enable\n"); + if (gl_info->supported[ARB_SHADER_TEXTURE_IMAGE_SAMPLES]) + shader_addline(buffer, "#extension GL_ARB_shader_texture_image_samples : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) shader_addline(buffer, "#extension GL_ARB_shading_language_420pack : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) @@ -11309,7 +11350,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SAMPLE_C */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_C_LZ */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_GRAD */ shader_glsl_sample, - /* WINED3DSIH_SAMPLE_INFO */ NULL, + /* WINED3DSIH_SAMPLE_INFO */ shader_glsl_sample_info, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_POS */ NULL, /* WINED3DSIH_SETP */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3750deea148a..be1b5962ed5d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1712,7 +1712,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co shader_record_sample(reg_maps, ins.src[2].reg.idx[0].offset, ins.src[3].reg.idx[0].offset, reg_maps->sampler_map.count); } - else if (ins.handler_idx == WINED3DSIH_BUFINFO && ins.src[0].reg.type == WINED3DSPR_RESOURCE) + else if ((ins.handler_idx == WINED3DSIH_BUFINFO && ins.src[0].reg.type == WINED3DSPR_RESOURCE) + || ins.handler_idx == WINED3DSIH_SAMPLE_INFO) { shader_record_sample(reg_maps, ins.src[0].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 49205f9c1205..db1929dbcbce 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -95,6 +95,7 @@ enum wined3d_gl_extension ARB_SHADER_IMAGE_LOAD_STORE, ARB_SHADER_IMAGE_SIZE, ARB_SHADER_STORAGE_BUFFER_OBJECT, + ARB_SHADER_TEXTURE_IMAGE_SAMPLES, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADING_LANGUAGE_420PACK, -- 2.16.1

2 8

[PATCH] dxgi: Allow setting maximum frame latency parameter.
by Nikolay Sivov 15 May '18

15 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxgi/device.c | 24 ++++++++++++++++++------ dlls/dxgi/tests/device.c | 19 +++++++++++-------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 2c85c1da6b..0341bb0e99 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -258,22 +258,34 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IWineDXGIDevic static HRESULT STDMETHODCALLTYPE dxgi_device_SetMaximumFrameLatency(IWineDXGIDevice *iface, UINT max_latency) { - FIXME("iface %p, max_latency %u stub!\n", iface, max_latency); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); + + TRACE("iface %p, max_latency %u.\n", iface, max_latency); if (max_latency > DXGI_FRAME_LATENCY_MAX) return DXGI_ERROR_INVALID_CALL; - return E_NOTIMPL; + wined3d_mutex_lock(); + wined3d_device_set_max_frame_latency(device->wined3d_device, max_latency); + wined3d_mutex_unlock(); + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_device_GetMaximumFrameLatency(IWineDXGIDevice *iface, UINT *max_latency) { - FIXME("iface %p, max_latency %p stub!\n", iface, max_latency); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); - if (max_latency) - *max_latency = DXGI_FRAME_LATENCY_DEFAULT; + TRACE("iface %p, max_latency %p.\n", iface, max_latency); - return E_NOTIMPL; + if (!max_latency) + return DXGI_ERROR_INVALID_CALL; + + wined3d_mutex_lock(); + *max_latency = wined3d_device_get_max_frame_latency(device->wined3d_device); + wined3d_mutex_unlock(); + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_device_OfferResources(IWineDXGIDevice *iface, UINT resource_count, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 8172269e74..3ad968308e 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -3426,26 +3426,29 @@ static void test_maximum_frame_latency(void) if (SUCCEEDED(IDXGIDevice_QueryInterface(device, &IID_IDXGIDevice1, (void **)&device1))) { + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(max_latency == DEFAULT_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY + 1); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); hr = IDXGIDevice1_SetMaximumFrameLatency(device1, 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* 0 does not reset to the default frame latency on all Windows versions. */ ok(max_latency == DEFAULT_FRAME_LATENCY || broken(!max_latency), "Got unexpected maximum frame latency %u.\n", max_latency); -- 2.17.0

2 1

[PATCH 4/4] mshtml/tests: Added more COM aggregation tests.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/protocol.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+)

1 0

[PATCH 3/4] mshtml: Properly support COM aggregation in about and res protocol handlers.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/main.c | 2 + dlls/mshtml/protocol.c | 146 ++++++++++++++++++++++++------------------------- 2 files changed, 72 insertions(+), 76 deletions(-)

1 0

[PATCH 2/4] mshtml: Share more code between res and about protocol handlers.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/protocol.c | 366 +++++++++++++++---------------------------------- 1 file changed, 112 insertions(+), 254 deletions(-)

1 0

[PATCH 1/4] mshtml: Share the same structure for about and res protocols.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/protocol.c | 106 +++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 61 deletions(-)

1 0

[PATCH 1/4] jscript: Support accessor properties in getOwnPropertyDescriptor.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 9 +++++++++ dlls/mshtml/tests/es5.js | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+)

2 1

[PATCH v2] ntdll: Add LdrRegisterDllNotification stub
by Alex Henrie 15 May '18

15 May '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=45205 Based on a Wine Staging patch by Michael Müller. v2: Replaced some Hungarian notation in winternl.h. dlls/ntdll/loader.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1a3dd801a1..01d7db7c0c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1461,6 +1461,16 @@ NTSTATUS WINAPI LdrEnumerateLoadedModules( void *unknown, LDRENUMPROC callback, return STATUS_SUCCESS; } +/****************************************************************** + * LdrRegisterDllNotification (NTDLL.@) + */ +NTSTATUS WINAPI LdrRegisterDllNotification(ULONG flags, PLDR_DLL_NOTIFICATION_FUNCTION callback, + void *context, void **cookie) +{ + FIXME( "(%04x, %p, %p, %p) stub!\n", flags, callback, context, cookie ); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************** * LdrLockLoaderLock (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7a58d7e37d..73b3103ba1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -83,6 +83,7 @@ @ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stdcall LdrQueryImageFileExecutionOptions(ptr wstr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) +@ stdcall LdrRegisterDllNotification(long ptr ptr ptr) @ stdcall LdrResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) @ stub LdrSetAppCompatDllRedirectionCallback @ stub LdrSetDllManifestProber diff --git a/include/winternl.h b/include/winternl.h index c84e6d7f88..07f42cf00d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2169,6 +2169,32 @@ typedef struct _LDR_MODULE HANDLE ActivationContext; } LDR_MODULE, *PLDR_MODULE; +typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA +{ + ULONG Flags; + const UNICODE_STRING *FullDllName; + const UNICODE_STRING *BaseDllName; + void *DllBase; + ULONG SizeOfImage; +} LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA; + +typedef struct _LDR_DLL_UNLOADED_NOTIFICATION_DATA +{ + ULONG Flags; + const UNICODE_STRING *FullDllName; + const UNICODE_STRING *BaseDllName; + void *DllBase; + ULONG SizeOfImage; +} LDR_DLL_UNLOADED_NOTIFICATION_DATA, *PLDR_DLL_UNLOADED_NOTIFICATION_DATA; + +typedef union _LDR_DLL_NOTIFICATION_DATA +{ + LDR_DLL_LOADED_NOTIFICATION_DATA Loaded; + LDR_DLL_UNLOADED_NOTIFICATION_DATA Unloaded; +} LDR_DLL_NOTIFICATION_DATA, *PLDR_DLL_NOTIFICATION_DATA; + +typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICATION_DATA*, void*); + /* those defines are (some of the) regular LDR_MODULE.Flags values */ #define LDR_IMAGE_IS_DLL 0x00000004 #define LDR_LOAD_IN_PROGRESS 0x00001000 -- 2.17.0

1 0

[PATCH 4/4] jscript: Support setting accessor property value.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 30 +++++++++++++++++++++--------- dlls/mshtml/tests/es5.js | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 9 deletions(-)

1 0

[PATCH 3/4] jscript: Move handling PROPF_WRITABLE to property type specific code.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)

1 0

[PATCH 2/4] jscript: Support getting value of accessor property.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 20 ++++++++++++++------ dlls/mshtml/tests/es5.js | 10 ++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-)

1 0

[PATCH 1/2] d2d1: Add ID2D1Device stub.
by Nikolay Sivov 15 May '18

15 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Comparing to what's in staging now, I renamed some things for consistency, and used existing source file. Same for device context, I think we should consider using render_target.c for it, or rename it to devicecontext.c. dlls/d2d1/factory.c | 143 +++++++++++++++++++++++++++++++++++++++++++- include/d2d1_1.idl | 61 ++++++++++++++++++- 2 files changed, 201 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 9bacc8583c..1ea27614e4 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -30,6 +30,135 @@ struct d2d_settings d2d_settings = ~0u, /* No ID2D1Factory version limit by default. */ }; +struct d2d_device +{ + ID2D1Device ID2D1Device_iface; + LONG refcount; + ID2D1Factory1 *factory; + IDXGIDevice *dxgi_device; +}; + +static inline struct d2d_device *impl_from_ID2D1Device(ID2D1Device *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_device, ID2D1Device_iface); +} + +static HRESULT WINAPI d2d_device_QueryInterface(ID2D1Device *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID2D1Device) + || IsEqualGUID(riid, &IID_ID2D1Resource) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID2D1Device_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d2d_device_AddRef(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI d2d_device_Release(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (refcount == 0) + { + IDXGIDevice_Release(device->dxgi_device); + ID2D1Factory1_Release(device->factory); + heap_free(device); + } + + return refcount; +} + +static void WINAPI d2d_device_GetFactory(ID2D1Device *iface, ID2D1Factory **factory) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + *factory = (ID2D1Factory *)device->factory; + ID2D1Factory1_AddRef(device->factory); +} + +static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, + ID2D1DeviceContext **context) +{ + FIXME("iface %p, options %#x, context %p stub!\n", iface, options, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d2d_device_CreatePrintControl(ID2D1Device *iface, IWICImagingFactory *wic_factory, + IPrintDocumentPackageTarget *document_target, const D2D1_PRINT_CONTROL_PROPERTIES *desc, + ID2D1PrintControl **print_control) +{ + FIXME("iface %p, wic_factory %p, document_target %p, desc %p, print_control %p stub!\n", iface, wic_factory, + document_target, desc, print_control); + + return E_NOTIMPL; +} + +static void WINAPI d2d_device_SetMaximumTextureMemory(ID2D1Device *iface, UINT64 max_texture_memory) +{ + FIXME("iface %p, max_texture_memory %s stub!\n", iface, wine_dbgstr_longlong(max_texture_memory)); +} + +static UINT64 WINAPI d2d_device_GetMaximumTextureMemory(ID2D1Device *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT WINAPI d2d_device_ClearResources(ID2D1Device *iface, UINT msec_since_use) +{ + FIXME("iface %p, msec_since_use %u stub!\n", iface, msec_since_use); + + return E_NOTIMPL; +} + +static const struct ID2D1DeviceVtbl d2d_device_vtbl = +{ + d2d_device_QueryInterface, + d2d_device_AddRef, + d2d_device_Release, + d2d_device_GetFactory, + d2d_device_CreateDeviceContext, + d2d_device_CreatePrintControl, + d2d_device_SetMaximumTextureMemory, + d2d_device_GetMaximumTextureMemory, + d2d_device_ClearResources, +}; + +static void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *iface, IDXGIDevice *dxgi_device) +{ + device->ID2D1Device_iface.lpVtbl = &d2d_device_vtbl; + device->refcount = 1; + device->factory = iface; + ID2D1Factory1_AddRef(device->factory); + device->dxgi_device = dxgi_device; + IDXGIDevice_AddRef(device->dxgi_device); +} + struct d2d_factory { ID2D1Factory1 ID2D1Factory1_iface; @@ -375,9 +504,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, IDXGIDevice *dxgi_device, ID2D1Device **device) { - FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + struct d2d_device *object; - return E_NOTIMPL; + TRACE("iface %p, dxgi_device %p, device %p.\n", iface, dxgi_device, device); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_device_init(object, iface, dxgi_device); + + TRACE("Create device %p.\n", object); + *device = &object->ID2D1Device_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1fbbb301dd..8f8b40b1d9 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -18,12 +18,22 @@ import "d2d1.idl"; -interface ID2D1Device; +interface ID2D1DeviceContext; interface ID2D1StrokeStyle1; interface ID2D1PathGeometry1; interface ID2D1DrawingStateBlock1; interface ID2D1GdiMetafile; interface ID2D1Properties; +interface IPrintDocumentPackageTarget; +interface ID2D1PrintControl; +interface IWICImagingFactory; + +typedef enum D2D1_DEVICE_CONTEXT_OPTIONS +{ + D2D1_DEVICE_CONTEXT_OPTIONS_NONE = 0, + D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS = 1, + D2D1_DEVICE_CONTEXT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_DEVICE_CONTEXT_OPTIONS; typedef enum D2D1_STROKE_TRANSFORM_TYPE { @@ -77,6 +87,55 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); +typedef enum D2D1_PRINT_FONT_SUBSET_MODE +{ + D2D1_PRINT_FONT_SUBSET_MODE_DEFAULT = 0, + D2D1_PRINT_FONT_SUBSET_MODE_EACHPAGE = 1, + D2D1_PRINT_FONT_SUBSET_MODE_NONE = 2, + D2D1_PRINT_FONT_SUBSET_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_PRINT_FONT_SUBSET_MODE; + +typedef enum D2D1_COLOR_SPACE +{ + D2D1_COLOR_SPACE_CUSTOM = 0, + D2D1_COLOR_SPACE_SRGB = 1, + D2D1_COLOR_SPACE_SCRGB = 2, + D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_SPACE; + +typedef struct D2D1_PRINT_CONTROL_PROPERTIES +{ + D2D1_PRINT_FONT_SUBSET_MODE fontSubset; + FLOAT rasterDPI; + D2D1_COLOR_SPACE colorSpace; +} D2D1_PRINT_CONTROL_PROPERTIES; + +[ + object, + uuid(47dd575d-ac05-4cdd-8049-9b02cd16f44c), + local, +] +interface ID2D1Device : ID2D1Resource +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext **context + ); + HRESULT CreatePrintControl( + [in] IWICImagingFactory *wic_factory, + [in] IPrintDocumentPackageTarget *document_target, + [in] const D2D1_PRINT_CONTROL_PROPERTIES *desc, + [out] ID2D1PrintControl **print_control + ); + void SetMaximumTextureMemory( + [in] UINT64 max_texture_memory + ); + UINT64 GetMaximumTextureMemory(); + HRESULT ClearResources( + [in, defaultvalue(0)] UINT msec_since_use + ); +} + [ object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), -- 2.17.0

1 1

[PATCH] user32: Simplify CheckMenuRadioItem().
by Huw Davies 15 May '18

15 May '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/menu.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 5b83703ace..8c541cc4f9 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5253,27 +5253,19 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, UINT check, UINT flags) { - POPUPMENU *first_menu = NULL, *check_menu = NULL; - UINT i, first_pos, check_pos; + POPUPMENU *first_menu = NULL, *check_menu; + UINT i, check_pos; BOOL done = FALSE; for (i = first; i <= last; i++) { MENUITEM *item; - if (!first_menu) - { - if (!(first_menu = find_menu_item(hMenu, i, flags, &first_pos))) - continue; + if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) + continue; - check_pos = first_pos; - check_menu = grab_menu_ptr(first_menu->obj.handle); - } - else - { - if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) - continue; - } + if (!first_menu) + first_menu = grab_menu_ptr(check_menu->obj.handle); if (first_menu != check_menu) { -- 2.16.2

1 0

[PATCH 3/3] mstask: Implement ITask::GetExitCode().
by Dmitry Timoshkov 15 May '18

15 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 4bf916660e..d487aeb5a5 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -59,10 +59,9 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; - UINT flags; HRESULT status; WORD idle_minutes, deadline_minutes; - DWORD priority, maxRunTime; + DWORD flags, priority, maxRunTime, exit_code; LPWSTR accountName; DWORD trigger_count; TASK_TRIGGER *trigger; @@ -492,10 +491,12 @@ static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) static HRESULT WINAPI MSTASK_ITask_GetExitCode(ITask *iface, DWORD *exit_code) { - FIXME("(%p, %p): stub\n", iface, exit_code); + TaskImpl *This = impl_from_ITask(iface); - *exit_code = 0; - return SCHED_S_TASK_HAS_NOT_RUN; + TRACE("(%p, %p)\n", iface, exit_code); + + *exit_code = This->exit_code; + return SCHED_S_TASK_HAS_NOT_RUN; /* FIXME */ } static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) @@ -1073,6 +1074,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) TRACE("maximum_runtime %u\n", fixed->maximum_runtime); This->maxRunTime = fixed->maximum_runtime; TRACE("exit_code %#x\n", fixed->exit_code); + This->exit_code = fixed->exit_code; TRACE("status %08x\n", fixed->status); This->status = fixed->status; TRACE("flags %08x\n", fixed->flags); @@ -1428,7 +1430,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta fixed.idle_deadline = This->deadline_minutes; fixed.priority = This->priority; fixed.maximum_runtime = This->maxRunTime; - fixed.exit_code = 0; + fixed.exit_code = This->exit_code; if (This->status == SCHED_S_TASK_NOT_SCHEDULED && This->trigger_count) This->status = SCHED_S_TASK_HAS_NOT_RUN; fixed.status = This->status; @@ -1656,6 +1658,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->task_name = heap_strdupW(task_name); This->flags = 0; This->status = SCHED_S_TASK_NOT_SCHEDULED; + This->exit_code = 0; This->idle_minutes = 10; This->deadline_minutes = 60; This->priority = NORMAL_PRIORITY_CLASS; -- 2.16.3

1 0

[PATCH 2/3] mstask: When writing triggers access the trigger data directly to avoid noise in the traces.
by Dmitry Timoshkov 15 May '18

15 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 5129d9a513..4bf916660e 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1311,46 +1311,41 @@ static BOOL write_user_data(HANDLE hfile, BYTE *data, WORD data_size) return WriteFile(hfile, data, data_size, &size, NULL); } -static HRESULT write_triggers(ITask *task, HANDLE hfile) +static HRESULT write_triggers(TaskImpl *This, HANDLE hfile) { WORD count, i, idx = 0xffff; DWORD size; - HRESULT hr; + HRESULT hr = S_OK; ITaskTrigger *trigger; - hr = ITask_GetTriggerCount(task, &count); - if (hr != S_OK) return hr; + count = This->trigger_count; /* Windows saves a .job with at least 1 trigger */ if (!count) { - hr = ITask_CreateTrigger(task, &idx, &trigger); + hr = ITask_CreateTrigger(&This->ITask_iface, &idx, &trigger); if (hr != S_OK) return hr; ITaskTrigger_Release(trigger); count = 1; } - if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) - return HRESULT_FROM_WIN32(GetLastError()); - - for (i = 0; i < count; i++) + if (WriteFile(hfile, &count, sizeof(count), &size, NULL)) { - TASK_TRIGGER task_trigger; - - hr = ITask_GetTrigger(task, i, &trigger); - if (hr != S_OK) return hr; - - hr = ITaskTrigger_GetTrigger(trigger, &task_trigger); - ITaskTrigger_Release(trigger); - if (hr != S_OK) break; - - if (!WriteFile(hfile, &task_trigger, sizeof(task_trigger), &size, NULL)) - return HRESULT_FROM_WIN32(GetLastError()); + for (i = 0; i < count; i++) + { + if (!WriteFile(hfile, &This->trigger[i], sizeof(This->trigger[0]), &size, NULL)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + break; + } + } } + else + hr = HRESULT_FROM_WIN32(GetLastError()); if (idx != 0xffff) - ITask_DeleteTrigger(task, idx); + ITask_DeleteTrigger(&This->ITask_iface, idx); return hr; } @@ -1508,7 +1503,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta } /* Triggers */ - hr = write_triggers(task, hfile); + hr = write_triggers(This, hfile); if (hr != S_OK) goto failed; -- 2.16.3

1 0

[PATCH 1/3] mstask: Prefer built-in implementation.
by Dmitry Timoshkov 15 May '18

15 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/mstask_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index e747af69e8..b028b151e8 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -41,8 +41,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); hInst = hinstDLL; -- 2.16.3

1 0

[PATCH v2 2/5] msi/tests: More accurately calculate estimated size.
by Zebediah Figura 15 May '18

15 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: query for page size dlls/msi/tests/action.c | 113 +++++++++++------------------------------------- 1 file changed, 26 insertions(+), 87 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 8e72ff4..849975d 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2321,45 +2321,6 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin ok_(__FILE__, line)(val == expected, "Expected %d, got %d\n", expected, val); } -static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, - DWORD expected4, DWORD line) -{ - DWORD val, size, type; - LONG res; - - size = sizeof(DWORD); - res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)&val, &size); - - if (res != ERROR_SUCCESS || type != REG_DWORD) - { - ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); - return; - } - - ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4, - "Expected %d, %d, %d or %d, got %d\n", expected1, expected2, expected3, expected4, val); -} - -static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, - DWORD expected4, DWORD expected5, DWORD line) -{ - DWORD val, size, type; - LONG res; - - size = sizeof(DWORD); - res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)&val, &size); - - if (res != ERROR_SUCCESS || type != REG_DWORD) - { - ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); - return; - } - - ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4 || - val == expected5, - "Expected %d, %d, %d, %d or %d, got %d\n", expected1, expected2, expected3, expected4, expected5, val); -} - #define CHECK_REG_STR(prodkey, name, expected) \ check_reg_str(prodkey, name, expected, TRUE, __LINE__); @@ -2387,24 +2348,6 @@ static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e RegDeleteValueA(prodkey, name); \ } while(0) -#define CHECK_REG_DWORD2(prodkey, name, expected1, expected2) \ - check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); - -#define CHECK_DEL_REG_DWORD2(prodkey, name, expected1, expected2) \ - do { \ - check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ - RegDeleteValueA(prodkey, name); \ - } while(0) - -#define CHECK_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ - check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); - -#define CHECK_DEL_REG_DWORD5(prodkey, name, expected1, expected2, expected3, expected4 ,expected5) \ - do { \ - check_reg_dword5(prodkey, name, expected1, expected2, expected3, expected4, expected5, __LINE__); \ - RegDeleteValueA(prodkey, name); \ - } while(0) - static void get_date_str(LPSTR date) { SYSTEMTIME systime; @@ -2414,6 +2357,22 @@ static void get_date_str(LPSTR date) sprintf(date, date_fmt, systime.wYear, systime.wMonth, systime.wDay); } +/* EstimatedSize is the size in KiB of .msi + installed files, rounded up to page size. */ +static DWORD get_estimated_size(void) +{ + SYSTEM_INFO si; + HANDLE file; + DWORD size; + + GetSystemInfo(&si); + + file = CreateFileA(msifile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + size = ((GetFileSize(file, NULL) + si.dwPageSize - 1) / si.dwPageSize + 1); + size = size * si.dwPageSize / 1024; + CloseHandle(file); + return size; +} + static void test_register_product(void) { UINT r; @@ -2505,9 +2464,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "VersionMinor", 1); CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(hkey, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); delete_key(hkey, "", access); RegCloseKey(hkey); @@ -2547,9 +2504,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "VersionMinor", 1); CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(props, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); delete_key(props, "", access); RegCloseKey(props); @@ -2616,9 +2571,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "VersionMinor", 1); CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(hkey, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); delete_key(hkey, "", access); RegCloseKey(hkey); @@ -2658,9 +2611,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "VersionMinor", 1); CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(props, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); delete_key(props, "", access); RegCloseKey(props); @@ -3525,9 +3476,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3631,9 +3580,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3714,9 +3661,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3774,9 +3719,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3834,9 +3777,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -20, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3917,9 +3858,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); -- 2.7.4

2 1

[PATCH] testbot/Engine: Don't delete the old logs when requeuing a Task.
by Francois Gouget 15 May '18

15 May '18

This makes it possible to access its logs for diagnosis until it actually gets restarted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 0f8de82af..ce3509440 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -143,7 +143,6 @@ sub Cleanup($;$$) if ($Requeue) { LogMsg "Requeuing $TaskKey\n"; - $Task->RmTree(); $Task->Status("queued"); $Task->Started(undef); $Task->Ended(undef); -- 2.17.0

1 0

[PATCH] testbot: Keep the old logs around.
by Francois Gouget 15 May '18

15 May '18

This helps figure out why the test was rerun: was it because it timed out the first time around? Because there was a network glitch? Or because the TestBot script got stuck or died unexpectedly? The error message in the old logs will make it clear. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Tasks.pm | 27 +++++++++++- testbot/web/JobDetails.pl | 75 ++++++++++++++++++++------------ 2 files changed, 73 insertions(+), 29 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 36cbfadbe..69d551b84 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -83,7 +83,32 @@ sub _SetupTask($$) my ($VM, $self) = @_; # Remove the previous run's files if any - $self->RmTree(); + my $Dir = $self->GetDir(); + if (-d $Dir) + { + mkpath("$Dir.new", 0, 0775); + rename "$Dir/log.old", "$Dir.new/log.old" if (-f "$Dir/log.old"); + rename "$Dir/err.old", "$Dir.new/err.old" if (-f "$Dir/err.old"); + foreach my $Filename ("log", "err") + { + if (open(my $Src, "<", "$Dir/$Filename")) + { + if (open(my $Dst, ">>", "$Dir.new/$Filename.old")) + { + print $Dst "----- Run ", ($self->TestFailures || 0), " $Filename\n"; + while (my $Line = <$Src>) + { + print $Dst $Line; + } + close($Dst); + } + close($Src); + } + } + + $self->RmTree(); + rename("$Dir.new", $Dir); + } # Capture Perl errors in the task's generic error log my $TaskDir = $self->CreateDir(); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 0213eb5e2..4d9a77a57 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -249,16 +249,21 @@ sub GenerateBody($) $self->CGI->escapeHTML($VM->Details || "No details!"), "</details>\n"; - my $ScreenshotParamName = "scrshot_$Key"; my $FullLogParamName = "log_$Key"; - my $LogName = "$TaskDir/log"; - my $ErrName = "$TaskDir/err"; + my $FullLog = $self->GetParam($FullLogParamName); + $FullLog = "" if ($FullLog !~ /^[12]$/); + + my $ScreenshotParamName = "scrshot_$Key"; + my $Screenshot = $self->GetParam($ScreenshotParamName); + $Screenshot = "" if ($Screenshot ne "1"); + + print "<div class='TaskMoreInfoLinks'>\n"; # FIXME: Disable live screenshots for now if (0 && $StepTask->Status eq "running" && ($StepTask->Type eq "single" || $StepTask->Type eq "suite")) { - if (defined($self->GetParam($ScreenshotParamName))) + if ($Screenshot) { my $URI = "/Screenshot.pl?VMName=" . uri_escape($VM->Name); print "<div class='Screenshot'><img src='" . @@ -277,7 +282,7 @@ sub GenerateBody($) } elsif (-r "$TaskDir/screenshot.png") { - if (defined($self->GetParam($ScreenshotParamName))) + if ($Screenshot) { my $URI = "/Screenshot.pl?JobKey=" . uri_escape($self->{JobId}) . "&StepKey=" . uri_escape($StepTask->StepNo) . @@ -289,10 +294,7 @@ sub GenerateBody($) { my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . "&$ScreenshotParamName=1"; - if (defined($self->GetParam($FullLogParamName))) - { - $URI .= "&$FullLogParamName=1"; - } + $URI .= "&$FullLogParamName=$FullLog"; $URI .= "#k" . uri_escape($Key); print "<div class='TaskMoreInfoLink'><a href='" . $self->CGI->escapeHTML($URI) . @@ -300,29 +302,46 @@ sub GenerateBody($) print "\n"; } } - my $FullLog = !1; - if (-r $LogName) + + my $LogName = "$TaskDir/log"; + my $ErrName = "$TaskDir/err"; + if (-r $LogName and $FullLog != "1") { - if (defined($self->GetParam($FullLogParamName))) - { - $FullLog = 1; - } - else - { - my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . - "&$FullLogParamName=1"; - if (defined($self->GetParam($ScreenshotParamName))) - { - $URI .= "&$ScreenshotParamName=1"; - } - $URI .= "#k" . uri_escape($Key); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Show full log</a></div>\n"; - } + my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . + "&$FullLogParamName=1"; + $URI .= "&$ScreenshotParamName=$Screenshot"; + $URI .= "#k" . uri_escape($Key); + print "<div class='TaskMoreInfoLink'><a href='" . + $self->CGI->escapeHTML($URI) . + "'>Show full log</a></div>\n"; + } + if ((-r $LogName or -r $ErrName) and $FullLog == "2") + { + my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}); + $URI .= "&$ScreenshotParamName=$Screenshot"; + $URI .= "#k" . uri_escape($Key); + print "<div class='TaskMoreInfoLink'><a href='" . + $self->CGI->escapeHTML($URI) . + "'>Show latest log</a></div>\n"; + } + if ((-r "$LogName.old" or -r "$ErrName.old") and $FullLog != "2") + { + my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . + "&$FullLogParamName=2"; + $URI .= "&$ScreenshotParamName=$Screenshot"; + $URI .= "#k" . uri_escape($Key); + print "<div class='TaskMoreInfoLink'><a href='" . + $self->CGI->escapeHTML($URI) . + "'>Show old logs</a></div>\n"; } print "</div>\n"; + if ($FullLog eq "2") + { + $LogName .= ".old"; + $ErrName .= ".old"; + } + if (open LOGFILE, "<$LogName") { my $HasLogEntries = !1; -- 2.17.0

1 0

[PATCH 2/2] d3d11: Return valid values for shader class instances
by Alistair Leslie-Hughes 15 May '18

15 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> Instead of returning garbage data for class instances, return 0 class instances. https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3d11/device.c | 12 ++++++++++++ dlls/d3d11/tests/d3d11.c | 6 ------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e4d8760..5bc5018 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1522,6 +1522,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) @@ -1577,6 +1579,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) @@ -1745,6 +1749,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_geometry_shader(device->wined3d_device))) @@ -2187,6 +2193,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_hull_shader(device->wined3d_device))) @@ -2294,6 +2302,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_domain_shader(device->wined3d_device))) @@ -2426,6 +2436,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_compute_shader(device->wined3d_device))) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1345b0e..72ca70f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9722,7 +9722,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, &instance_count); ok(!tmp_vs, "Got unexpected vertex shader %p.\n", tmp_vs); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_HSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9744,7 +9743,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, &instance_count); ok(!tmp_hs, "Got unexpected hull shader %p.\n", tmp_hs); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_DSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9766,7 +9764,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, &instance_count); ok(!tmp_ds, "Got unexpected domain shader %p.\n", tmp_ds); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_GSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9788,7 +9785,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, &instance_count); ok(!tmp_gs, "Got unexpected geometry shader %p.\n", tmp_gs); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_PSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9811,7 +9807,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, &instance_count); ok(!tmp_ps, "Got unexpected pixel shader %p.\n", tmp_ps); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9834,7 +9829,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, &instance_count); ok(!tmp_cs, "Got unexpected compute shader %p.\n", tmp_cs); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetUnorderedAccessViews(context, 0, D3D11_PS_CS_UAV_REGISTER_COUNT, tmp_uav); for (i = 0; i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) -- 1.9.1

1 0

[PATCH 1/2] d3d11: Test shader class instance count
by Alistair Leslie-Hughes 15 May '18

15 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3d11/tests/d3d11.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a..1345b0e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9688,7 +9688,7 @@ static void test_clear_state(void) UINT sample_mask; UINT stencil_ref; ULONG refcount; - UINT count, i; + UINT count, i, instance_count; HRESULT hr; device_desc.feature_level = &feature_level; @@ -9719,8 +9719,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, &instance_count); ok(!tmp_vs, "Got unexpected vertex shader %p.\n", tmp_vs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_HSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9738,8 +9741,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, &instance_count); ok(!tmp_hs, "Got unexpected hull shader %p.\n", tmp_hs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_DSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9757,8 +9763,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, &instance_count); ok(!tmp_ds, "Got unexpected domain shader %p.\n", tmp_ds); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_GSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9776,8 +9785,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, &instance_count); ok(!tmp_gs, "Got unexpected geometry shader %p.\n", tmp_gs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_PSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9796,8 +9808,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, &instance_count); ok(!tmp_ps, "Got unexpected pixel shader %p.\n", tmp_ps); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9816,8 +9831,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, &instance_count); ok(!tmp_cs, "Got unexpected compute shader %p.\n", tmp_cs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetUnorderedAccessViews(context, 0, D3D11_PS_CS_UAV_REGISTER_COUNT, tmp_uav); for (i = 0; i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) { -- 1.9.1

1 0

[PATCH] ntdll: Add LdrRegisterDllNotification stub
by Alex Henrie 15 May '18

15 May '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=45205 Based on a Wine Staging patch by Michael Müller. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/loader.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1a3dd801a1..01d7db7c0c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1461,6 +1461,16 @@ NTSTATUS WINAPI LdrEnumerateLoadedModules( void *unknown, LDRENUMPROC callback, return STATUS_SUCCESS; } +/****************************************************************** + * LdrRegisterDllNotification (NTDLL.@) + */ +NTSTATUS WINAPI LdrRegisterDllNotification(ULONG flags, PLDR_DLL_NOTIFICATION_FUNCTION callback, + void *context, void **cookie) +{ + FIXME( "(%04x, %p, %p, %p) stub!\n", flags, callback, context, cookie ); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************** * LdrLockLoaderLock (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7a58d7e37d..73b3103ba1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -83,6 +83,7 @@ @ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stdcall LdrQueryImageFileExecutionOptions(ptr wstr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) +@ stdcall LdrRegisterDllNotification(long ptr ptr ptr) @ stdcall LdrResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) @ stub LdrSetAppCompatDllRedirectionCallback @ stub LdrSetDllManifestProber diff --git a/include/winternl.h b/include/winternl.h index c84e6d7f88..308bd5818e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2169,6 +2169,32 @@ typedef struct _LDR_MODULE HANDLE ActivationContext; } LDR_MODULE, *PLDR_MODULE; +typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA +{ + ULONG Flags; + PCUNICODE_STRING FullDllName; + PCUNICODE_STRING BaseDllName; + PVOID DllBase; + ULONG SizeOfImage; +} LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA; + +typedef struct _LDR_DLL_UNLOADED_NOTIFICATION_DATA +{ + ULONG Flags; + PCUNICODE_STRING FullDllName; + PCUNICODE_STRING BaseDllName; + PVOID DllBase; + ULONG SizeOfImage; +} LDR_DLL_UNLOADED_NOTIFICATION_DATA, *PLDR_DLL_UNLOADED_NOTIFICATION_DATA; + +typedef union _LDR_DLL_NOTIFICATION_DATA +{ + LDR_DLL_LOADED_NOTIFICATION_DATA Loaded; + LDR_DLL_UNLOADED_NOTIFICATION_DATA Unloaded; +} LDR_DLL_NOTIFICATION_DATA, *PLDR_DLL_NOTIFICATION_DATA; + +typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICATION_DATA*, void*); + /* those defines are (some of the) regular LDR_MODULE.Flags values */ #define LDR_IMAGE_IS_DLL 0x00000004 #define LDR_LOAD_IN_PROGRESS 0x00001000 -- 2.17.0

1 0

[PATCH] d3d11/tests: Add test for depth clip.
by Zebediah Figura 15 May '18

15 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a..ca6130b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26567,6 +26567,79 @@ static void test_multisample_resolve(void) release_test_context(&test_context); } +static void test_depth_clip(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_RASTERIZER_DESC rs_desc; + ID3D11DeviceContext *context; + ID3D11DepthStencilView *dsv; + ID3D11RasterizerState *rs; + ID3D11Texture2D *texture; + ID3D11Device *device; + unsigned int count; + D3D11_VIEWPORT vp; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, dsv); + + count = 1; + ID3D11DeviceContext_RSGetViewports(context, &count, &vp); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); + check_texture_float(texture, 1.0f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); + check_texture_float(texture, 0.5f, 1); + + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = FALSE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetState(context, rs); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); +todo_wine + check_texture_float(texture, 0.6f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); +todo_wine + check_texture_float(texture, 0.4f, 1); + + ID3D11DepthStencilView_Release(dsv); + ID3D11Texture2D_Release(texture); + ID3D11RasterizerState_Release(rs); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -26704,4 +26777,5 @@ START_TEST(d3d11) test_unbound_multisample_texture(); test_multiple_viewports(); test_multisample_resolve(); + test_depth_clip(); } -- 2.7.4

1 0

[PATCH] wsdapi/tests: Expand ProbeHandler tests.
by Owen Rudge 14 May '18

14 May '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 118 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 107 insertions(+), 11 deletions(-)

2 1

[PATCH 1/4] gdiplus: Use ARRAY_SIZE() macro.
by Nikolay Sivov 14 May '18

14 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/brush.c | 2 +- dlls/gdiplus/font.c | 4 ++-- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/image.c | 6 +++--- dlls/gdiplus/metafile.c | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 0114a510ca..3aeb654086 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -232,7 +232,7 @@ static const char HatchBrushes[][8] = { GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) { - if (hatchstyle < sizeof(HatchBrushes) / sizeof(HatchBrushes[0])) + if (hatchstyle < ARRAY_SIZE(HatchBrushes)) { *result = HatchBrushes[hatchstyle]; return Ok; diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index f99b026b25..64778bb226 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1367,7 +1367,7 @@ static int match_name_table_language( const tt_name_record *name, LANGID lang ) case TT_PLATFORM_MACINTOSH: if (!IsValidCodePage( get_mac_code_page( name ))) return 0; name_lang = GET_BE_WORD(name->language_id); - if (name_lang >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (name_lang >= ARRAY_SIZE(mac_langid_table)) return 0; name_lang = mac_langid_table[name_lang]; break; case TT_PLATFORM_APPLE_UNICODE: @@ -1377,7 +1377,7 @@ static int match_name_table_language( const tt_name_record *name, LANGID lang ) case TT_APPLE_ID_ISO_10646: case TT_APPLE_ID_UNICODE_2_0: name_lang = GET_BE_WORD(name->language_id); - if (name_lang >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (name_lang >= ARRAY_SIZE(mac_langid_table)) return 0; name_lang = mac_langid_table[name_lang]; break; default: diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index ea79f1183c..9fff578a28 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -35,6 +35,8 @@ #include "gdiplus.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + #define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER) #define MAX_ARC_PTS (13) #define MAX_DASHLEN (16) /* this is a limitation of gdi */ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b03630c55c..9841857e63 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2554,7 +2554,7 @@ static UINT vt_to_itemtype(UINT vt) { VT_BLOB, PropertyTagTypeUndefined } }; UINT i; - for (i = 0; i < sizeof(vt2type)/sizeof(vt2type[0]); i++) + for (i = 0; i < ARRAY_SIZE(vt2type); i++) { if (vt2type[i].vt == vt) return vt2type[i].type; } @@ -3454,10 +3454,10 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI { if (name.vt == VT_LPSTR) { - for (j=0; j<sizeof(keywords)/sizeof(keywords[0]); j++) + for (j = 0; j < ARRAY_SIZE(keywords); j++) if (!strcmp(keywords[j].name, name.u.pszVal)) break; - if (j < sizeof(keywords)/sizeof(keywords[0]) && !keywords[j].seen) + if (j < ARRAY_SIZE(keywords) && !keywords[j].seen) { keywords[j].seen = TRUE; item = create_prop(keywords[j].propid, &value); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 77673a7ea3..08dde2fec6 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -606,7 +606,7 @@ void METAFILE_Free(GpMetafile *metafile) if (metafile->record_stream) IStream_Release(metafile->record_stream); - for (i = 0; i < sizeof(metafile->objtable)/sizeof(metafile->objtable[0]); i++) + for (i = 0; i < ARRAY_SIZE(metafile->objtable); i++) metafile_free_object_table_entry(metafile, i); } -- 2.17.0

4 13

[PATCH] winemac: Transform the process to a GUI app on an attempt to change the display mode.
by Ken Thomases 14 May '18

14 May '18

It had only been done when a window is shown. Some games change the display mode before showing their first window. Following Mac conventions, the Mac driver does not apply display mode changes when it's not the active GUI app. If such a game were to change the mode and then query display-mode-related info, it would get info for the original mode, not the requested mode. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 46176f7..239c11f 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -843,7 +843,6 @@ - (BOOL) setMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID } else { - BOOL active = [NSApp isActive]; CGDisplayModeRef currentMode; NSArray* modes; @@ -866,6 +865,10 @@ - (BOOL) setMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID if (!modes.count) return FALSE; + [self transformProcessToForeground]; + + BOOL active = [NSApp isActive]; + if ([originalDisplayModes count] || displaysCapturedForFullscreen || !active || CGCaptureAllDisplays() == CGDisplayNoErr) { -- 2.10.2

1 0

[PATCH Wine Translations] Update Korean translations.
by 김건우 14 May '18

14 May '18

1 0

[PATCH] winebus: Print SDL error message when SDL cannot be initialized.
by Józef Kucia 14 May '18

14 May '18

SDL_Init(SDL_INIT_HAPTIC) fails if SDL is built without haptic support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 03e7cb3e2ba2..159727f6bce4 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -910,7 +910,7 @@ static DWORD CALLBACK deviceloop_thread(void *args) if (pSDL_Init(SDL_INIT_GAMECONTROLLER|SDL_INIT_HAPTIC) < 0) { - ERR("Can't Init SDL\n"); + ERR("Can't init SDL: %s\n", pSDL_GetError()); return STATUS_UNSUCCESSFUL; } -- 2.16.1

2 1

[PATCH] po: Update Czech translation
by AsciiWolf 14 May '18

14 May '18

Hello, I have updated the Czech translation. The last time it was updated was in 2013. Feel free to merge this patch. Regards, Daniel Rusek

1 1

[PATCH 1/5] msi/tests: Add a header for some common functions.
by Zebediah Figura 14 May '18

14 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 469 +---------------------------------------- dlls/msi/tests/install.c | 72 +++---- dlls/msi/tests/msi.c | 527 +++-------------------------------------------- dlls/msi/tests/utils.h | 60 ++++++ 4 files changed, 117 insertions(+), 1011 deletions(-) create mode 100644 dlls/msi/tests/utils.h diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 31cc981..8e72ff4 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -34,6 +34,7 @@ #include <winsvc.h> #include "wine/test.h" +#include "utils.h" static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE *); @@ -46,9 +47,7 @@ static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) static UINT (WINAPI *pMsiQueryFeatureStateExA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE *); -static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR *); -static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -60,11 +59,6 @@ static BOOL is_wow64; static const BOOL is_64bit = sizeof(void *) > sizeof(int); static const char *msifile = "msitest.msi"; -static CHAR CURR_DIR[MAX_PATH]; -static CHAR PROG_FILES_DIR[MAX_PATH]; -static CHAR COMMON_FILES_DIR[MAX_PATH]; -static CHAR APP_DATA_DIR[MAX_PATH]; -static CHAR WINDOWS_DIR[MAX_PATH]; /* msi database data */ @@ -1679,15 +1673,6 @@ static const char rep_install_exec_seq_dat[] = "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; -typedef struct _msi_table -{ - const char *filename; - const char *data; - unsigned int size; -} msi_table; - -#define ADD_TABLE(x) {#x".idt", x##_dat, sizeof(x##_dat)} - static const msi_table env_tables[] = { ADD_TABLE(component), @@ -2152,110 +2137,6 @@ cleanup: /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 0x7FFFFFFF -#define FOLDER_THRESHOLD 900000 - -/* the FCI callbacks */ - -static void * CDECL mem_alloc(ULONG cb) -{ - return HeapAlloc(GetProcessHeap(), 0, cb); -} - -static void CDECL mem_free(void *memory) -{ - HeapFree(GetProcessHeap(), 0, memory); -} - -static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) -{ - sprintf(pccab->szCab, pv, pccab->iCab); - return TRUE; -} - -static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) -{ - return 0; -} - -static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile, - BOOL fContinuation, void *pv) -{ - return 0; -} - -static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) -{ - HANDLE handle; - DWORD dwAccess = 0; - DWORD dwShareMode = 0; - DWORD dwCreateDisposition = OPEN_EXISTING; - - dwAccess = GENERIC_READ | GENERIC_WRITE; - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; - - if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) - dwCreateDisposition = OPEN_EXISTING; - else - dwCreateDisposition = CREATE_NEW; - - handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, - dwCreateDisposition, 0, NULL); - - ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszFile); - - return (INT_PTR)handle; -} - -static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD dwRead; - BOOL res; - - res = ReadFile(handle, memory, cb, &dwRead, NULL); - ok(res, "Failed to ReadFile\n"); - - return dwRead; -} - -static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD dwWritten; - BOOL res; - - res = WriteFile(handle, memory, cb, &dwWritten, NULL); - ok(res, "Failed to WriteFile\n"); - - return dwWritten; -} - -static int CDECL fci_close(INT_PTR hf, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - ok(CloseHandle(handle), "Failed to CloseHandle\n"); - - return 0; -} - -static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD ret; - - ret = SetFilePointer(handle, dist, NULL, seektype); - ok(ret != INVALID_SET_FILE_POINTER, "Failed to SetFilePointer\n"); - - return ret; -} - -static int CDECL fci_delete(char *pszFile, int *err, void *pv) -{ - BOOL ret = DeleteFileA(pszFile); - ok(ret, "Failed to DeleteFile %s\n", pszFile); - - return 0; -} static void init_functionpointers(void) { @@ -2274,9 +2155,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hmsi, MsiQueryFeatureStateExA); - GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA); - GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) @@ -2287,44 +2166,6 @@ static void init_functionpointers(void) #undef GET_PROC } -static BOOL is_process_limited(void) -{ - SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group = NULL; - BOOL IsInGroup; - HANDLE token; - - if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; - - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is an administrator\n"); - FreeSid(Group); - return FALSE; - } - FreeSid(Group); - - if (!IsInGroup) - { - /* Only administrators have enough privileges for these tests */ - return TRUE; - } - - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) - { - BOOL ret; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; -} - static char *get_user_sid(void) { HANDLE token; @@ -2349,185 +2190,6 @@ static char *get_user_sid(void) return usersid; } -static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) -{ - LPSTR tempname; - - tempname = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); - GetTempFileNameA(".", "xx", 0, tempname); - - if (tempname && (strlen(tempname) < (unsigned)cbTempName)) - { - lstrcpyA(pszTempName, tempname); - HeapFree(GetProcessHeap(), 0, tempname); - return TRUE; - } - - HeapFree(GetProcessHeap(), 0, tempname); - - return FALSE; -} - -static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, - USHORT *pattribs, int *err, void *pv) -{ - BY_HANDLE_FILE_INFORMATION finfo; - FILETIME filetime; - HANDLE handle; - DWORD attrs; - BOOL res; - - handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); - - ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); - - res = GetFileInformationByHandle(handle, &finfo); - ok(res, "Expected GetFileInformationByHandle to succeed\n"); - - FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); - FileTimeToDosDateTime(&filetime, pdate, ptime); - - attrs = GetFileAttributesA(pszName); - ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); - - return (INT_PTR)handle; -} - -static BOOL add_file(HFCI hfci, const char *file, TCOMP compress) -{ - char path[MAX_PATH]; - char filename[MAX_PATH]; - - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - - lstrcpyA(filename, file); - - return FCIAddFile(hfci, path, filename, FALSE, get_next_cabinet, - progress, get_open_info, compress); -} - -static void set_cab_parameters(PCCAB pCabParams, const CHAR *name, DWORD max_size) -{ - ZeroMemory(pCabParams, sizeof(CCAB)); - - pCabParams->cb = max_size; - pCabParams->cbFolderThresh = FOLDER_THRESHOLD; - pCabParams->setID = 0xbeef; - pCabParams->iCab = 1; - lstrcpyA(pCabParams->szCabPath, CURR_DIR); - lstrcatA(pCabParams->szCabPath, "\\"); - lstrcpyA(pCabParams->szCab, name); -} - -static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) -{ - CCAB cabParams; - LPCSTR ptr; - HFCI hfci; - ERF erf; - BOOL res; - - set_cab_parameters(&cabParams, name, max_size); - - hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, - fci_read, fci_write, fci_close, fci_seek, fci_delete, - get_temp_file, &cabParams, NULL); - - ok(hfci != NULL, "Failed to create an FCI context\n"); - - ptr = files; - while (*ptr) - { - res = add_file(hfci, ptr, tcompTYPE_MSZIP); - ok(res, "Failed to add file: %s\n", ptr); - ptr += lstrlenA(ptr) + 1; - } - - res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); - ok(res, "Failed to flush the cabinet\n"); - - res = FCIDestroy(hfci); - ok(res, "Failed to destroy the cabinet\n"); -} - -static BOOL get_user_dirs(void) -{ - HKEY hkey; - DWORD type, size; - - if (RegOpenKeyA(HKEY_CURRENT_USER, - "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &hkey)) - return FALSE; - - size = MAX_PATH; - if (RegQueryValueExA(hkey, "AppData", 0, &type, (LPBYTE)APP_DATA_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - - RegCloseKey(hkey); - return TRUE; -} - -static BOOL get_system_dirs(void) -{ - HKEY hkey; - DWORD type, size; - - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) - return FALSE; - - size = MAX_PATH; - if (RegQueryValueExA(hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)PROG_FILES_DIR, &size) && - RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)PROG_FILES_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - - size = MAX_PATH; - if (RegQueryValueExA(hkey, "CommonFilesDir (x86)", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size) && - RegQueryValueExA(hkey, "CommonFilesDir", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - - RegCloseKey(hkey); - - if (!GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH)) - return FALSE; - - return TRUE; -} - -static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) -{ - HANDLE file; - DWORD written; - - file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if (file == INVALID_HANDLE_VALUE) - return; - - WriteFile(file, data, strlen(data), &written, NULL); - - if (size) - { - SetFilePointer(file, size, NULL, FILE_BEGIN); - SetEndOfFile(file); - } - - CloseHandle(file); -} - -#define create_file(name, size) create_file_data(name, name, size) - static void create_test_files(void) { CreateDirectoryA("msitest", NULL); @@ -2549,20 +2211,6 @@ static void create_test_files(void) DeleteFileA("five.txt"); } -static BOOL delete_pf(const CHAR *rel_path, BOOL is_file) -{ - CHAR path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, rel_path); - - if (is_file) - return DeleteFileA(path); - else - return RemoveDirectoryA(path); -} - static void delete_test_files(void) { DeleteFileA("msitest.msi"); @@ -2578,89 +2226,6 @@ static void delete_test_files(void) RemoveDirectoryA("msitest"); } -static void write_file(const CHAR *filename, const char *data, int data_size) -{ - DWORD size; - HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - WriteFile(hf, data, data_size, &size, NULL); - CloseHandle(hf); -} - -static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, const char *template) -{ - MSIHANDLE summary; - UINT r; - - r = MsiGetSummaryInformationA(db, NULL, 5, &summary); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_TEMPLATE, VT_LPSTR, 0, NULL, template); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_REVNUMBER, VT_LPSTR, 0, NULL, - "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, version, NULL, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_WORDCOUNT, VT_I4, wordcount, NULL, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_TITLE, VT_LPSTR, 0, NULL, "MSITEST"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* write the summary changes back to the stream */ - r = MsiSummaryInfoPersist(summary); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - MsiCloseHandle(summary); -} - -#define create_database(name, tables, num_tables) \ - create_database_wordcount(name, tables, num_tables, 100, 0, ";1033"); - -#define create_database_template(name, tables, num_tables, version, template) \ - create_database_wordcount(name, tables, num_tables, version, 0, template); - -static void create_database_wordcount(const CHAR *name, const msi_table *tables, - int num_tables, INT version, INT wordcount, - const char *template) -{ - MSIHANDLE db; - UINT r; - WCHAR *nameW; - int j, len; - - len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); - if (!(nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return; - MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len ); - - r = MsiOpenDatabaseW(nameW, MSIDBOPEN_CREATE, &db); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* import the tables into the database */ - for (j = 0; j < num_tables; j++) - { - const msi_table *table = &tables[j]; - - write_file(table->filename, table->data, (table->size - 1) * sizeof(char)); - - r = MsiDatabaseImportA(db, CURR_DIR, table->filename); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - DeleteFileA(table->filename); - } - - write_msi_summary_info(db, version, wordcount, template); - - r = MsiDatabaseCommit(db); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - MsiCloseHandle(db); - HeapFree( GetProcessHeap(), 0, nameW ); -} - static BOOL notify_system_change(DWORD event_type, STATEMGRSTATUS *status) { RESTOREPOINTINFOA spec; @@ -2689,22 +2254,6 @@ static LONG delete_key( HKEY key, LPCSTR subkey, REGSAM access ) return RegDeleteKeyA( key, subkey ); } -static BOOL file_exists(LPCSTR file) -{ - return GetFileAttributesA(file) != INVALID_FILE_ATTRIBUTES; -} - -static BOOL pf_exists(LPCSTR file) -{ - CHAR path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - - return file_exists(path); -} - static void delete_pfmsitest_files(void) { SHFILEOPSTRUCTA shfl; @@ -4615,22 +4164,6 @@ error: RemoveDirectoryA("msitest"); } -static void create_pf_data(LPCSTR file, LPCSTR data, BOOL is_file) -{ - CHAR path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - - if (is_file) - create_file_data(path, data, 500); - else - CreateDirectoryA(path, NULL); -} - -#define create_pf(file, is_file) create_pf_data(file, file, is_file) - static void test_remove_files(void) { UINT r; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ac2c837..a2b95d1 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -35,6 +35,7 @@ #include <shellapi.h> #include "wine/test.h" +#include "utils.h" static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE*); @@ -43,9 +44,7 @@ static UINT (WINAPI *pMsiSourceListEnumSourcesA) static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); -static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); -static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); @@ -65,12 +64,12 @@ static const char *mstfile = "winetest.mst"; static const WCHAR msifileW[] = {'m','s','i','t','e','s','t','.','m','s','i',0}; static const WCHAR msifile2W[] = {'w','i','n','e','t','e','s','t','2','.','m','s','i',0}; -static CHAR CURR_DIR[MAX_PATH]; -static CHAR PROG_FILES_DIR[MAX_PATH]; -static CHAR PROG_FILES_DIR_NATIVE[MAX_PATH]; -static CHAR COMMON_FILES_DIR[MAX_PATH]; -static CHAR APP_DATA_DIR[MAX_PATH]; -static CHAR WINDOWS_DIR[MAX_PATH]; +char CURR_DIR[MAX_PATH]; +char PROG_FILES_DIR[MAX_PATH]; +char PROG_FILES_DIR_NATIVE[MAX_PATH]; +char COMMON_FILES_DIR[MAX_PATH]; +char APP_DATA_DIR[MAX_PATH]; +char WINDOWS_DIR[MAX_PATH]; static const char *customdll; @@ -1348,15 +1347,6 @@ static const CHAR x64_directory_dat[] = "ProgramFiles64Folder\tTARGETDIR\t.\n" "TARGETDIR\t\tSourceDir"; -typedef struct _msi_table -{ - const CHAR *filename; - const CHAR *data; - int size; -} msi_table; - -#define ADD_TABLE(x) {#x".idt", x##_dat, sizeof(x##_dat)} - static const msi_table tables[] = { ADD_TABLE(component), @@ -2084,8 +2074,7 @@ static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, voi DWORD dwCreateDisposition = OPEN_EXISTING; dwAccess = GENERIC_READ | GENERIC_WRITE; - /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) dwCreateDisposition = OPEN_EXISTING; @@ -2166,9 +2155,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiSourceListEnumSourcesA); GET_PROC(hmsi, MsiGetComponentPathExA); - GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA); - GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) GET_PROC(hkernel32, Wow64DisableWow64FsRedirection); @@ -2181,18 +2168,16 @@ static void init_functionpointers(void) #undef GET_PROC } -static BOOL is_process_limited(void) +BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; PSID Group = NULL; BOOL IsInGroup; HANDLE token; - if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) + !CheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); FreeSid(Group); @@ -2206,7 +2191,7 @@ static BOOL is_process_limited(void) return TRUE; } - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) + if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) { BOOL ret; TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; @@ -2303,7 +2288,7 @@ static void set_cab_parameters(PCCAB pCabParams, const CHAR *name, DWORD max_siz lstrcpyA(pCabParams->szCab, name); } -static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) +void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) { CCAB cabParams; LPCSTR ptr; @@ -2334,7 +2319,7 @@ static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) ok(res, "Failed to destroy the cabinet\n"); } -static BOOL get_user_dirs(void) +BOOL get_user_dirs(void) { HKEY hkey; DWORD type, size; @@ -2353,7 +2338,7 @@ static BOOL get_user_dirs(void) return TRUE; } -static BOOL get_system_dirs(void) +BOOL get_system_dirs(void) { HKEY hkey; DWORD type, size; @@ -2390,7 +2375,7 @@ static BOOL get_system_dirs(void) return TRUE; } -static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) +void create_file_data(LPCSTR name, LPCSTR data, DWORD size) { HANDLE file; DWORD written; @@ -2410,8 +2395,6 @@ static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) CloseHandle(file); } -#define create_file(name, size) create_file_data(name, name, size) - static void create_test_files(void) { CreateDirectoryA("msitest", NULL); @@ -2432,7 +2415,7 @@ static void create_test_files(void) DeleteFileA("five.txt"); } -static BOOL delete_pf(const CHAR *rel_path, BOOL is_file) +BOOL delete_pf(const CHAR *rel_path, BOOL is_file) { CHAR path[MAX_PATH]; @@ -2568,17 +2551,8 @@ static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, MsiCloseHandle(summary); } -#define create_database(name, tables, num_tables) \ - create_database_wordcount(name, tables, num_tables, 100, 0, ";1033", \ - "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); - -#define create_database_template(name, tables, num_tables, version, template) \ - create_database_wordcount(name, tables, num_tables, version, 0, template, \ - "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); - -static void create_database_wordcount(const CHAR *name, const msi_table *tables, - int num_tables, INT version, INT wordcount, - const char *template, const char *packagecode) +void create_database_wordcount(const CHAR *name, const msi_table *tables, int num_tables, + INT version, INT wordcount, const char *template, const char *packagecode) { MSIHANDLE db; UINT r; @@ -3018,7 +2992,7 @@ static void create_cc_test_files(void) DeleteFileA("caesar"); } -static void delete_cab_files(void) +void delete_cab_files(void) { SHFILEOPSTRUCTA shfl; CHAR path[MAX_PATH+10]; @@ -3536,12 +3510,12 @@ error: RemoveDirectoryA("msitest"); } -static BOOL file_exists(LPCSTR file) +BOOL file_exists(const char *file) { return GetFileAttributesA(file) != INVALID_FILE_ATTRIBUTES; } -static BOOL pf_exists(LPCSTR file) +BOOL pf_exists(const char *file) { CHAR path[MAX_PATH]; @@ -3574,7 +3548,7 @@ static void delete_pfmsitest_files(void) RemoveDirectoryA(path); } -static UINT run_query(MSIHANDLE hdb, MSIHANDLE hrec, const char *query) +UINT run_query(MSIHANDLE hdb, MSIHANDLE hrec, const char *query) { MSIHANDLE hview = 0; UINT r; @@ -3976,7 +3950,7 @@ error: RemoveDirectoryA("msitest"); } -static void create_pf_data(LPCSTR file, LPCSTR data, BOOL is_file) +void create_pf_data(LPCSTR file, LPCSTR data, BOOL is_file) { CHAR path[MAX_PATH]; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 85ab7ba..3778019 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -32,19 +32,13 @@ #include <objidl.h> #include "wine/test.h" +#include "utils.h" static BOOL is_wow64; static const char msifile[] = "winetest.msi"; static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0}; -static char CURR_DIR[MAX_PATH]; -static char PROG_FILES_DIR[MAX_PATH]; -static char PROG_FILES_DIR_NATIVE[MAX_PATH]; -static char COMMON_FILES_DIR[MAX_PATH]; -static char WINDOWS_DIR[MAX_PATH]; -static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); -static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -110,328 +104,19 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiEnumComponentsExA) GET_PROC(hmsi, MsiSourceListGetInfoA) - GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA) - GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) #undef GET_PROC } -static BOOL get_system_dirs(void) -{ - HKEY hkey; - DWORD type, size; - - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) - return FALSE; - - size = MAX_PATH; - if (RegQueryValueExA(hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)PROG_FILES_DIR, &size) && - RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)PROG_FILES_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - size = MAX_PATH; - if (RegQueryValueExA(hkey, "CommonFilesDir (x86)", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size) && - RegQueryValueExA(hkey, "CommonFilesDir", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - size = MAX_PATH; - if (RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)PROG_FILES_DIR_NATIVE, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - RegCloseKey(hkey); - if (!GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH)) return FALSE; - return TRUE; -} - -static BOOL file_exists(const char *file) -{ - return GetFileAttributesA(file) != INVALID_FILE_ATTRIBUTES; -} - -static BOOL pf_exists(const char *file) -{ - char path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - return file_exists(path); -} - -static BOOL delete_pf(const char *rel_path, BOOL is_file) -{ - char path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, rel_path); - - if (is_file) - return DeleteFileA(path); - else - return RemoveDirectoryA(path); -} - -static BOOL is_process_limited(void) -{ - SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group = NULL; - BOOL IsInGroup; - HANDLE token; - - if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; - - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is an administrator\n"); - FreeSid(Group); - return FALSE; - } - FreeSid(Group); - - if (!IsInGroup) - { - /* Only administrators have enough privileges for these tests */ - return TRUE; - } - - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) - { - BOOL ret; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; -} - /* cabinet definitions */ /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 0x7FFFFFFF #define FOLDER_THRESHOLD 900000 -/* the FCI callbacks */ - -static void * CDECL mem_alloc(ULONG cb) -{ - return HeapAlloc(GetProcessHeap(), 0, cb); -} - -static void CDECL mem_free(void *memory) -{ - HeapFree(GetProcessHeap(), 0, memory); -} - -static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) -{ - sprintf(pccab->szCab, pv, pccab->iCab); - return TRUE; -} - -static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) -{ - return 0; -} - -static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile, - BOOL fContinuation, void *pv) -{ - return 0; -} - -static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) -{ - HANDLE handle; - DWORD dwAccess = 0; - DWORD dwShareMode = 0; - DWORD dwCreateDisposition = OPEN_EXISTING; - - dwAccess = GENERIC_READ | GENERIC_WRITE; - /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; - - if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) - dwCreateDisposition = OPEN_EXISTING; - else - dwCreateDisposition = CREATE_NEW; - - handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, - dwCreateDisposition, 0, NULL); - - ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszFile); - - return (INT_PTR)handle; -} - -static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD dwRead; - BOOL res; - - res = ReadFile(handle, memory, cb, &dwRead, NULL); - ok(res, "Failed to ReadFile\n"); - - return dwRead; -} - -static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD dwWritten; - BOOL res; - - res = WriteFile(handle, memory, cb, &dwWritten, NULL); - ok(res, "Failed to WriteFile\n"); - - return dwWritten; -} - -static int CDECL fci_close(INT_PTR hf, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - ok(CloseHandle(handle), "Failed to CloseHandle\n"); - - return 0; -} - -static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD ret; - - ret = SetFilePointer(handle, dist, NULL, seektype); - ok(ret != INVALID_SET_FILE_POINTER, "Failed to SetFilePointer\n"); - - return ret; -} - -static int CDECL fci_delete(char *pszFile, int *err, void *pv) -{ - BOOL ret = DeleteFileA(pszFile); - ok(ret, "Failed to DeleteFile %s\n", pszFile); - - return 0; -} - -static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) -{ - LPSTR tempname; - - tempname = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); - GetTempFileNameA(".", "xx", 0, tempname); - - if (tempname && (strlen(tempname) < (unsigned)cbTempName)) - { - lstrcpyA(pszTempName, tempname); - HeapFree(GetProcessHeap(), 0, tempname); - return TRUE; - } - - HeapFree(GetProcessHeap(), 0, tempname); - - return FALSE; -} - -static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, - USHORT *pattribs, int *err, void *pv) -{ - BY_HANDLE_FILE_INFORMATION finfo; - FILETIME filetime; - HANDLE handle; - DWORD attrs; - BOOL res; - - handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); - ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); - - res = GetFileInformationByHandle(handle, &finfo); - ok(res, "Expected GetFileInformationByHandle to succeed\n"); - - FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); - FileTimeToDosDateTime(&filetime, pdate, ptime); - - attrs = GetFileAttributesA(pszName); - ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); - - return (INT_PTR)handle; -} - -static BOOL add_file(HFCI hfci, const char *file, TCOMP compress) -{ - char path[MAX_PATH]; - char filename[MAX_PATH]; - - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - - lstrcpyA(filename, file); - - return FCIAddFile(hfci, path, filename, FALSE, get_next_cabinet, - progress, get_open_info, compress); -} - -static void set_cab_parameters(PCCAB pCabParams, const CHAR *name, DWORD max_size) -{ - ZeroMemory(pCabParams, sizeof(CCAB)); - - pCabParams->cb = max_size; - pCabParams->cbFolderThresh = FOLDER_THRESHOLD; - pCabParams->setID = 0xbeef; - pCabParams->iCab = 1; - lstrcpyA(pCabParams->szCabPath, CURR_DIR); - lstrcatA(pCabParams->szCabPath, "\\"); - lstrcpyA(pCabParams->szCab, name); -} - -static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) -{ - CCAB cabParams; - LPCSTR ptr; - HFCI hfci; - ERF erf; - BOOL res; - - set_cab_parameters(&cabParams, name, max_size); - - hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, - fci_read, fci_write, fci_close, fci_seek, fci_delete, - get_temp_file, &cabParams, NULL); - - ok(hfci != NULL, "Failed to create an FCI context\n"); - - ptr = files; - while (*ptr) - { - res = add_file(hfci, ptr, tcompTYPE_MSZIP); - ok(res, "Failed to add file: %s\n", ptr); - ptr += lstrlenA(ptr) + 1; - } - - res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); - ok(res, "Failed to flush the cabinet\n"); - - res = FCIDestroy(hfci); - ok(res, "Failed to destroy the cabinet\n"); -} - static BOOL add_cabinet_storage(LPCSTR db, LPCSTR cabinet) { WCHAR dbW[MAX_PATH], cabinetW[MAX_PATH]; @@ -469,24 +154,6 @@ static BOOL add_cabinet_storage(LPCSTR db, LPCSTR cabinet) return TRUE; } -static void delete_cab_files(void) -{ - SHFILEOPSTRUCTA shfl; - CHAR path[MAX_PATH+10]; - - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\*.cab"); - path[strlen(path) + 1] = '\0'; - - shfl.hwnd = NULL; - shfl.wFunc = FO_DELETE; - shfl.pFrom = path; - shfl.pTo = NULL; - shfl.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_NORECURSION | FOF_SILENT; - - SHFileOperationA(&shfl); -} - /* msi database data */ static const char directory_dat[] = @@ -908,15 +575,6 @@ static const char cl_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "InstallFinalize\t\t5000\n"; -typedef struct _msi_table -{ - const CHAR *filename; - const CHAR *data; - int size; -} msi_table; - -#define ADD_TABLE(x) {#x".idt", x##_dat, sizeof(x##_dat)} - static const msi_table tables[] = { ADD_TABLE(directory), @@ -1043,107 +701,6 @@ static const msi_table cl_tables[] = ADD_TABLE(property) }; -static void write_file(const CHAR *filename, const char *data, int data_size) -{ - DWORD size; - - HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - WriteFile(hf, data, data_size, &size, NULL); - CloseHandle(hf); -} - -static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, const char *template) -{ - MSIHANDLE summary; - UINT r; - - r = MsiGetSummaryInformationA(db, NULL, 5, &summary); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_TEMPLATE, VT_LPSTR, 0, NULL, template); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_REVNUMBER, VT_LPSTR, 0, NULL, - "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, version, NULL, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_WORDCOUNT, VT_I4, wordcount, NULL, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_TITLE, VT_LPSTR, 0, NULL, "MSITEST"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* write the summary changes back to the stream */ - r = MsiSummaryInfoPersist(summary); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - MsiCloseHandle(summary); -} - -#define create_database(name, tables, num_tables) \ - create_database_wordcount(name, tables, num_tables, 100, 0, ";1033"); - -#define create_database_template(name, tables, num_tables, version, template) \ - create_database_wordcount(name, tables, num_tables, version, 0, template); - -static void create_database_wordcount(const CHAR *name, const msi_table *tables, - int num_tables, INT version, INT wordcount, - const char *template) -{ - MSIHANDLE db; - UINT r; - WCHAR *nameW; - int j, len; - - len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); - if (!(nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return; - MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len ); - - r = MsiOpenDatabaseW(nameW, MSIDBOPEN_CREATE, &db); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* import the tables into the database */ - for (j = 0; j < num_tables; j++) - { - const msi_table *table = &tables[j]; - - write_file(table->filename, table->data, (table->size - 1) * sizeof(char)); - - r = MsiDatabaseImportA(db, CURR_DIR, table->filename); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - DeleteFileA(table->filename); - } - - write_msi_summary_info(db, version, wordcount, template); - - r = MsiDatabaseCommit(db); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - MsiCloseHandle(db); - HeapFree( GetProcessHeap(), 0, nameW ); -} - -static UINT run_query(MSIHANDLE hdb, const char *query) -{ - MSIHANDLE hview = 0; - UINT r; - - r = MsiDatabaseOpenViewA(hdb, query, &hview); - if (r != ERROR_SUCCESS) - return r; - - r = MsiViewExecute(hview, 0); - if (r == ERROR_SUCCESS) - r = MsiViewClose(hview); - MsiCloseHandle(hview); - return r; -} - static UINT set_summary_info(MSIHANDLE hdb, LPSTR prodcode) { UINT res; @@ -1207,7 +764,7 @@ static MSIHANDLE create_package_db(LPSTR prodcode) set_summary_info(hdb, prodcode); - res = run_query(hdb, + res = run_query(hdb, 0, "CREATE TABLE `Directory` ( " "`Directory` CHAR(255) NOT NULL, " "`Directory_Parent` CHAR(255), " @@ -1215,7 +772,7 @@ static MSIHANDLE create_package_db(LPSTR prodcode) "PRIMARY KEY `Directory`)"); ok(res == ERROR_SUCCESS , "Failed to create directory table\n"); - res = run_query(hdb, + res = run_query(hdb, 0, "CREATE TABLE `Property` ( " "`Property` CHAR(72) NOT NULL, " "`Value` CHAR(255) " @@ -1225,7 +782,7 @@ static MSIHANDLE create_package_db(LPSTR prodcode) sprintf(query, "INSERT INTO `Property` " "(`Property`, `Value`) " "VALUES( 'ProductCode', '%s' )", prodcode); - res = run_query(hdb, query); + res = run_query(hdb, 0, query); ok(res == ERROR_SUCCESS , "Failed\n"); res = MsiDatabaseCommit(hdb); @@ -1428,39 +985,21 @@ static void test_getcomponentpath(void) ok( r == INSTALLSTATE_UNKNOWN, "wrong return value\n"); } -static void create_file(LPCSTR name, LPCSTR data, DWORD size) -{ - HANDLE file; - DWORD written; - - file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); - WriteFile(file, data, strlen(data), &written, NULL); - - if (size) - { - SetFilePointer(file, size, NULL, FILE_BEGIN); - SetEndOfFile(file); - } - - CloseHandle(file); -} - static void create_test_files(void) { CreateDirectoryA("msitest", NULL); - create_file("msitest\\one.txt", "msitest\\one.txt", 100); + create_file("msitest\\one.txt", 100); CreateDirectoryA("msitest\\first", NULL); - create_file("msitest\\first\\two.txt", "msitest\\first\\two.txt", 100); + create_file("msitest\\first\\two.txt", 100); CreateDirectoryA("msitest\\second", NULL); - create_file("msitest\\second\\three.txt", "msitest\\second\\three.txt", 100); + create_file("msitest\\second\\three.txt", 100); - create_file("four.txt", "four.txt", 100); - create_file("five.txt", "five.txt", 100); + create_file("four.txt", 100); + create_file("five.txt", 100); create_cab_file("msitest.cab", MEDIA_SIZE, "four.txt\0five.txt\0"); - create_file("msitest\\filename", "msitest\\filename", 100); - create_file("msitest\\service.exe", "msitest\\service.exe", 100); + create_file("msitest\\filename", 100); + create_file("msitest\\service.exe", 100); DeleteFileA("four.txt"); DeleteFileA("five.txt"); @@ -1559,7 +1098,7 @@ static void test_MsiGetFileHash(void) { int ret; - create_file(name, hash_data[i].data, hash_data[i].size); + create_file_data(name, hash_data[i].data, hash_data[i].size); memset(&hash, 0, sizeof(MSIFILEHASHINFO)); hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); @@ -3030,7 +2569,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 'a'; @@ -3134,7 +2673,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 0; @@ -3244,7 +2783,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 0; @@ -3326,7 +2865,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 0; @@ -3403,7 +2942,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 0; @@ -3537,7 +3076,7 @@ static void test_MsiGetComponentPathEx(void) ok( !lstrcmpA( path, "c:\\testcomponentpath"), "got %s\n", path ); ok( size == 20, "got %u\n", size ); - create_file( "c:\\testcomponentpath", "c:\\testcomponentpath", 21 ); + create_file( "c:\\testcomponentpath", 21 ); /* file exists */ path[0] = 0; @@ -3600,7 +3139,7 @@ static void test_MsiGetComponentPathEx(void) ok( !lstrcmpA( path, "c:\\testcomponentpath"), "got %s\n", path ); ok( size == 20, "got %u\n", size ); - create_file( "c:\\testcomponentpath", "c:\\testcomponentpath", 21 ); + create_file( "c:\\testcomponentpath", 21 ); /* file exists */ path[0] = 0; @@ -3676,7 +3215,7 @@ static void test_MsiGetComponentPathEx(void) ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); ok( size == 20, "got %u\n", size ); - create_file( "c:\\testcomponentpath", "C:\\testcomponentpath", 21 ); + create_file( "c:\\testcomponentpath", 21 ); /* file exists */ path[0] = 0; @@ -3731,7 +3270,7 @@ static void test_MsiGetComponentPathEx(void) ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); ok( size == 20, "got %u\n", size ); - create_file( "c:\\testcomponentpath", "c:\\testcomponentpath", 21 ); + create_file( "c:\\testcomponentpath", 21 ); /* file exists */ path[0] = 0; @@ -3773,7 +3312,7 @@ static void test_MsiProvideComponent(void) } create_test_files(); - create_file("msitest\\sourcedir.txt", "msitest\\sourcedir.txt", 1000); + create_file("msitest\\sourcedir.txt", 1000); create_database(msifile, sd_tables, sizeof(sd_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); @@ -3957,7 +3496,7 @@ static void test_MsiProvideQualifiedComponentEx(void) lstrcatA( path, "\\msitest" ); CreateDirectoryA( path, NULL ); lstrcatA( path, "\\test.txt" ); - create_file( path, "test", 100 ); + create_file_data( path, "test", 100 ); res = RegSetValueExA( hkey5, prod_squashed, 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1 ); ok( res == ERROR_SUCCESS, "got %d\n", res ); @@ -4600,7 +4139,7 @@ static void test_MsiGetFileVersion(void) ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); - create_file("ver.txt", "ver.txt", 20); + create_file("ver.txt", 20); /* file exists, no version information */ r = MsiGetFileVersionA("ver.txt", NULL, NULL, NULL, NULL); @@ -13543,7 +13082,7 @@ static void test_MsiGetFileSignatureInformation(void) hr = MsiGetFileSignatureInformationA( "signature.bin", 0, &cert, NULL, &len ); todo_wine ok(hr == CRYPT_E_FILE_ERROR, "expected CRYPT_E_FILE_ERROR got 0x%08x\n", hr); - create_file( "signature.bin", "signature", sizeof("signature") ); + create_file_data( "signature.bin", "signature", sizeof("signature") ); hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, NULL ); ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); @@ -13901,9 +13440,9 @@ static void test_MsiConfigureProductEx(void) } CreateDirectoryA("msitest", NULL); - create_file("msitest\\hydrogen", "hydrogen", 500); - create_file("msitest\\helium", "helium", 500); - create_file("msitest\\lithium", "lithium", 500); + create_file_data("msitest\\hydrogen", "hydrogen", 500); + create_file_data("msitest\\helium", "helium", 500); + create_file_data("msitest\\lithium", "lithium", 500); create_database(msifile, mcp_tables, sizeof(mcp_tables) / sizeof(msi_table)); @@ -14444,7 +13983,7 @@ static void test_lastusedsource(void) } CreateDirectoryA("msitest", NULL); - create_file("maximus", "maximus", 500); + create_file("maximus", 500); create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); DeleteFileA("maximus"); @@ -14568,7 +14107,7 @@ static void test_setpropertyfolder(void) lstrcatA(path, "\\msitest\\added"); CreateDirectoryA("msitest", NULL); - create_file("msitest\\maximus", "msitest\\maximus", 500); + create_file("msitest\\maximus", 500); create_database(msifile, spf_tables, sizeof(spf_tables) / sizeof(msi_table)); @@ -14612,7 +14151,7 @@ static void test_sourcedir_props(void) } create_test_files(); - create_file("msitest\\sourcedir.txt", "msitest\\sourcedir.txt", 1000); + create_file("msitest\\sourcedir.txt", 1000); create_database(msifile, sd_tables, sizeof(sd_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); @@ -14677,8 +14216,8 @@ static void test_concurrentinstall(void) CreateDirectoryA("msitest", NULL); CreateDirectoryA("msitest\\msitest", NULL); - create_file("msitest\\maximus", "msitest\\maximus", 500); - create_file("msitest\\msitest\\augustus", "msitest\\msitest\\augustus", 500); + create_file("msitest\\maximus", 500); + create_file("msitest\\msitest\\augustus", 500); create_database(msifile, ci_tables, sizeof(ci_tables) / sizeof(msi_table)); diff --git a/dlls/msi/tests/utils.h b/dlls/msi/tests/utils.h new file mode 100644 index 0000000..f16e2d5 --- /dev/null +++ b/dlls/msi/tests/utils.h @@ -0,0 +1,60 @@ +/* + * Copyright 2018 Zebediah Figura + * + * 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 + */ + +char PROG_FILES_DIR[MAX_PATH]; +char PROG_FILES_DIR_NATIVE[MAX_PATH]; +char COMMON_FILES_DIR[MAX_PATH]; +char APP_DATA_DIR[MAX_PATH]; +char WINDOWS_DIR[MAX_PATH]; +char CURR_DIR[MAX_PATH]; + +BOOL get_system_dirs(void); +BOOL get_user_dirs(void); + +typedef struct _msi_table +{ + const char *filename; + const char *data; + int size; +} msi_table; + +#define ADD_TABLE(x) {#x".idt", x##_dat, sizeof(x##_dat)} + +/* in install.c */ +void create_database_wordcount(const char *name, const msi_table *tables, int num_tables, + int version, int wordcount, const char *template, const char *packagecode); + +#define create_database(name, tables, num_tables) \ + create_database_wordcount(name, tables, num_tables, 100, 0, ";1033", \ + "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); + +#define create_database_template(name, tables, num_tables, version, template) \ + create_database_wordcount(name, tables, num_tables, version, 0, template, \ + "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); + +void create_cab_file(const char *name, DWORD max_size, const char *files); +void create_file_data(const char *name, const char *data, DWORD size); +#define create_file(name, size) create_file_data(name, name, size) +void create_pf_data(const char *file, const char *data, BOOL is_file); +#define create_pf(file, is_file) create_pf_data(file, file, is_file) +void delete_cab_files(void); +BOOL delete_pf(const char *rel_path, BOOL is_file); +BOOL file_exists(const char *file); +BOOL pf_exists(const char *file); +BOOL is_process_limited(void); +UINT run_query(MSIHANDLE hdb, MSIHANDLE hrec, const char *query); -- 2.7.4

3 13

[PATCH] d3d11: Partially implement d3d11_immediate_context_UpdateSubresource1().
by Henri Verbeet 14 May '18

14 May '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 18fa670b333..e4d87603df8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2603,11 +2603,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3 } static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11DeviceContext1 *iface, - ID3D11Resource *resource, UINT subresource, const D3D11_BOX *box, const void *data, - UINT rowpitch, UINT depth_pitch, UINT flags) + ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, + UINT row_pitch, UINT depth_pitch, UINT flags) { - FIXME("iface %p, resource %p, subresource %u, box %p, data %p, rowpitch %u, depth_pitch %u, flags %#x stub!\n", - iface, resource, subresource, box, data, rowpitch, depth_pitch, flags); + TRACE("iface %p, resource %p, subresource_idx %u, box %p, data %p, row_pitch %u, depth_pitch %u, flags %#x.\n", + iface, resource, subresource_idx, box, data, row_pitch, depth_pitch, flags); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + d3d11_immediate_context_UpdateSubresource(iface, resource, subresource_idx, box, data, row_pitch, depth_pitch); } static void STDMETHODCALLTYPE d3d11_immediate_context_DiscardResource(ID3D11DeviceContext1 *iface, -- 2.11.0

1 0

[PATCH] d3d9: Implement setting the maximum frame latency.
by Henri Verbeet 14 May '18

14 May '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 20 +++++++++++++++----- dlls/d3d9/tests/d3d9ex.c | 10 +++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 21342575434..e3562c7c57a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3762,21 +3762,31 @@ static HRESULT WINAPI d3d9_device_CheckResourceResidency(IDirect3DDevice9Ex *ifa static HRESULT WINAPI d3d9_device_SetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT max_latency) { + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + TRACE("iface %p, max_latency %u.\n", iface, max_latency); - if (max_latency) - FIXME("Ignoring max_latency %u.\n", max_latency); + if (max_latency > 30) + return D3DERR_INVALIDCALL; + + wined3d_mutex_lock(); + wined3d_device_set_max_frame_latency(device->wined3d_device, max_latency); + wined3d_mutex_unlock(); return S_OK; } static HRESULT WINAPI d3d9_device_GetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT *max_latency) { - FIXME("iface %p, max_latency %p stub!\n", iface, max_latency); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - *max_latency = 2; + TRACE("iface %p, max_latency %p.\n", iface, max_latency); - return E_NOTIMPL; + wined3d_mutex_lock(); + *max_latency = wined3d_device_get_max_frame_latency(device->wined3d_device); + wined3d_mutex_unlock(); + + return S_OK; } static HRESULT WINAPI d3d9_device_CheckDeviceState(IDirect3DDevice9Ex *iface, HWND dst_window) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 7c36e6ee643..d210b8baedf 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4060,31 +4060,27 @@ static void test_frame_latency(void) } hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); -todo_wine { ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); -} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 1); ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); -todo_wine { ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); ok(latency == 1, "Unexpected max frame latency %u.\n", latency); -} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 0); ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); -todo_wine { ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); -} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 30); ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 31); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); refcount = IDirect3DDevice9Ex_Release(device); -- 2.11.0

1 0

[PATCH] wined3d: Recognize Titan V
by Christian Inci 14 May '18

14 May '18

Signed-off-by: Christian Inci <chris.wine(a)broke-the-inter.net> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7deefaf82d..fdd4e124dc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1400,6 +1400,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_GEFORCE8, 12288}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1888,6 +1889,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"TITAN V", CARD_NVIDIA_TITANV}, /* GeForce 1000 - highend */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b297799f82..bb20842342 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2438,6 +2438,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, + CARD_NVIDIA_TITANV = 0x1d81, CARD_VMWARE_SVGA3D = 0x0405, -- 2.17.0

2 1

[PATCH] wined3d: Fix memory leak in shader_glsl_init_transform_feedback().
by Józef Kucia 14 May '18

14 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a9af9acd31f4..eddf35d83a04 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -950,6 +950,7 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co { FIXME("No varyings to record, disabling transform feedback.\n"); shader->u.gs.so_desc.element_count = 0; + string_buffer_release(&priv->string_buffers, buffer); return; } -- 2.16.1

2 1

[PATCH 1/5] wined3d: Don't add pixel center offset twice.
by Matteo Bruni 14 May '18

14 May '18

Fixes cf312011c0e1f43123682f7f2e783174fea65425. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/state.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 87c734685c..175fd14a0e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4091,13 +4091,10 @@ static void viewport_miscpart_cc(struct wined3d_context *context, for (i = 0; i < state->viewport_count; ++i) { - vp[i].x += pixel_center_offset; - vp[i].y += pixel_center_offset; - depth_ranges[i * 2] = vp[i].min_z; depth_ranges[i * 2 + 1] = vp[i].max_z; - viewports[i * 4 ] = vp[i].x + pixel_center_offset; + viewports[i * 4] = vp[i].x + pixel_center_offset; viewports[i * 4 + 1] = vp[i].y + pixel_center_offset; viewports[i * 4 + 2] = vp[i].width; viewports[i * 4 + 3] = vp[i].height; -- 2.16.1

2 9

[PATCH] d3d10core/tests: Add test for depth clip.
by Zebediah Figura 14 May '18

14 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/device.c | 72 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a1924f9..65f610d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16750,6 +16750,77 @@ static void test_multisample_resolve(void) release_test_context(&test_context); } +static void test_depth_clip(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + D3D10_RASTERIZER_DESC rs_desc; + ID3D10DepthStencilView *dsv; + ID3D10RasterizerState *rs; + ID3D10Texture2D *texture; + ID3D10Device *device; + unsigned int count; + D3D10_VIEWPORT vp; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, dsv); + + count = 1; + ID3D10Device_RSGetViewports(device, &count, &vp); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); + check_texture_float(texture, 1.0f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); + check_texture_float(texture, 0.5f, 1); + + rs_desc.FillMode = D3D10_FILL_SOLID; + rs_desc.CullMode = D3D10_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = FALSE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D10Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D10Device_RSSetState(device, rs); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); +todo_wine + check_texture_float(texture, 0.6f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); +todo_wine + check_texture_float(texture, 0.4f, 1); + + ID3D10DepthStencilView_Release(dsv); + ID3D10Texture2D_Release(texture); + ID3D10RasterizerState_Release(rs); + release_test_context(&test_context); +} + START_TEST(device) { unsigned int argc, i; @@ -16853,4 +16924,5 @@ START_TEST(device) test_alpha_to_coverage(); test_multiple_viewports(); test_multisample_resolve(); + test_depth_clip(); } -- 2.7.4

2 1

[v2 PATCH] dxgi: Add IDXGIDevice2 stub.
by Nikolay Sivov 14 May '18

14 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Fixed a typo in trace message. Thanks, Pablo. dlls/dxgi/device.c | 30 ++++++++++++++++++++++++++++++ include/wine/winedxgi.idl | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5a810fa810..2c85c1da6b 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -41,6 +41,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IDXGIDevice) || IsEqualGUID(riid, &IID_IDXGIDevice1) + || IsEqualGUID(riid, &IID_IDXGIDevice2) || IsEqualGUID(riid, &IID_IWineDXGIDevice)) { IUnknown_AddRef(iface); @@ -275,6 +276,31 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetMaximumFrameLatency(IWineDXGIDev return E_NOTIMPL; } +static HRESULT STDMETHODCALLTYPE dxgi_device_OfferResources(IWineDXGIDevice *iface, UINT resource_count, + IDXGIResource * const *resources, DXGI_OFFER_RESOURCE_PRIORITY priority) +{ + FIXME("iface %p, resource_count %u, resources %p, priority %u stub!\n", iface, resource_count, + resources, priority); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_device_ReclaimResources(IWineDXGIDevice *iface, UINT resource_count, + IDXGIResource * const *resources, BOOL *discarded) +{ + FIXME("iface %p, resource_count %u, resources %p, discarded %p stub!\n", iface, resource_count, + resources, discarded); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_device_EnqueueSetEvent(IWineDXGIDevice *iface, HANDLE event) +{ + FIXME("iface %p, event %p stub!\n", iface, event); + + return E_NOTIMPL; +} + /* IWineDXGIDevice methods */ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, @@ -355,6 +381,10 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = /* IDXGIDevice1 methods */ dxgi_device_SetMaximumFrameLatency, dxgi_device_GetMaximumFrameLatency, + /* IDXGIDevice2 methods */ + dxgi_device_OfferResources, + dxgi_device_ReclaimResources, + dxgi_device_EnqueueSetEvent, /* IWineDXGIDevice methods */ dxgi_device_create_surface, dxgi_device_create_swapchain, diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 2c5734280c..3a1d6fa064 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -25,7 +25,7 @@ import "dxgi1_5.idl"; local, uuid(3e1ff30b-c951-48c3-b010-0fb49f3dca71) ] -interface IWineDXGIDevice : IDXGIDevice1 +interface IWineDXGIDevice : IDXGIDevice2 { HRESULT create_surface( [in] struct wined3d_texture *wined3d_texture, -- 2.17.0

2 1

[PATCH 7/7] jscript: Added support for accessor properties in defineProperty.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 121 +++++++++++++++++++++++++++++++++++++---------- dlls/mshtml/tests/es5.js | 81 +++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 25 deletions(-)

1 0

[PATCH 6/7] jscript: Added Object.defineProperties stub.
by Jacek Caban 14 May '18

14 May '18

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

1 0

[PATCH 5/7] jscript: Use jsdisp_define_property to set prototype constructors.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 5 ----- dlls/jscript/function.c | 3 ++- dlls/jscript/jscript.h | 1 - dlls/mshtml/tests/es5.js | 1 + 4 files changed, 3 insertions(+), 7 deletions(-)

1 0

[PATCH 4/7] jscript: Use jsdisp_define_property to set function prototypes.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 12 ++++-------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 8 insertions(+), 8 deletions(-)

1 0

[PATCH 3/7] jscript: Use jsdisp_define_data_property for arguments object properties.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 6 ++++-- dlls/mshtml/tests/es5.js | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[PATCH 2/7] jscript: Use jsdisp_define_property for Error object properties.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/error.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)

1 0

[PATCH 1/7] jscript: Get rid of no longer used jsdisp_propput_const.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 12 ------------ 1 file changed, 12 deletions(-)

1 0

[PATCH] wined3d: Implement WINED3DFMT_B8G8R8X8_UNORM to WINED3DFMT_L8_UNORM conversion
by Stanislav Zhukov 14 May '18

14 May '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=44888 Signed-off-by: Stanislav Zhukov <koncord(a)tes3mp.com> --- dlls/wined3d/surface.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5217033..351d888 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -801,6 +801,25 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst, } } +static void convert_x8r8g8b8_l8(const BYTE *src, BYTE *dst, + DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) +{ + unsigned int x, y; + + TRACE("Converting %ux%u pixels, pitches %u %u.\n", w, h, pitch_in, pitch_out); + + for (y = 0; y < h; ++y) + { + const DWORD *src_line = (const DWORD *)(src + y * pitch_in); + BYTE *dst_line = (BYTE *)(dst + y * pitch_out); + + for (x = 0; x < w; ++x) + { + dst_line[x] = src_line[x] & 0x000000ff; + } + } +} + struct d3dfmt_converter_desc { enum wined3d_format_id from, to; @@ -815,6 +834,7 @@ static const struct d3dfmt_converter_desc converters[] = {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8A8_UNORM, convert_a8r8g8b8_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B8G8R8X8_UNORM, convert_yuy2_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_L8_UNORM, convert_x8r8g8b8_l8}, }; static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_format_id from, -- 2.7.4

2 1

[PATCH] testbot: Tweak the 'Putting VM offline' email.
by Francois Gouget 14 May '18

14 May '18

Emphasize that the TestBot is still monitoring the VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 5d60dde1b..f9a43bb77 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -208,7 +208,7 @@ sub FatalError($) NotifyAdministrator("Putting the $VMKey VM offline", "Could not perform the $Action operation on the $VMKey VM:\n". "\n$ErrMessage\n". - "The VM has been put offline."); + "The VM has been put offline and the TestBot will try to regain access to it."); } exit 1; } -- 2.17.0

1 0

[PATCH] testbot: Requeue the task in case the script gets stuck.
by Francois Gouget 14 May '18

14 May '18

Count how many times the task has been requeued to avoid infinite loops, just like the scripts themselves normally do. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Tasks.pm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 72dd3ff23..36cbfadbe 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -165,11 +165,25 @@ sub UpdateStatus($$) close TASKLOG; } umask($OldUMask); - # This probably indicates a bug in the task script. - # Don't requeue the task to avoid an infinite loop. + require WineTestBot::Log; WineTestBot::Log::LogMsg("Child process for task $JobId/$StepNo/$TaskNo died unexpectedly\n"); - $self->Status("boterror"); + + # A crash probably indicates a bug in the task script but getting stuck + # could happen due to network issues. So requeue the task like its script + # would and count attempts to avoid getting into an infinite loop. + if ($self->CanRetry()) + { + $Status = "queued"; + $self->TestFailures(($self->TestFailures || 0) + 1); + $self->Started(undef); + $self->Ended(undef); + } + else + { + $Status = "boterror"; + } + $self->Status($Status); $self->Save(); if ($VM->Status eq "running") @@ -181,8 +195,6 @@ sub UpdateStatus($$) $VM->RecordResult(undef, "boterror process died"); } # else it looks like this is not our VM anymore - - $Status = "boterror"; } elsif ($Skip && $Status eq "queued") { -- 2.17.0

1 0

[PATCH] shell32: Check array index limit first.
by Andrey Gusev 14 May '18

14 May '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/shell32/shelllink.c | 2 +- dlls/shell32/xdg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 07c83d151c..0380ac9e7a 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -613,7 +613,7 @@ static LPWSTR Stream_LoadPath( LPCSTR p, DWORD maxlen ) int len = 0, wlen; LPWSTR path; - while( p[len] && (len < maxlen) ) + while( (len < maxlen) && p[len] ) len++; wlen = MultiByteToWideChar(CP_ACP, 0, p, len, NULL, 0); diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 622ef34623..781902a238 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -341,7 +341,7 @@ static int dskentry_decode(const char *value, int len, char *output) while (pos<len) { char c; - if (value[pos] == '\\' && pos<len-1) + if (pos<len-1 && value[pos] == '\\') { pos++; switch (value[pos]) -- 2.14.3

1 0

[PATCH 7/7] mstask: Move trigger management to the ITask implementation.
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/mstask_private.h | 4 +- dlls/mstask/task.c | 193 ++++++++++++++++++++++++++++++++++--- dlls/mstask/task_trigger.c | 203 ++++----------------------------------- dlls/mstask/tests/task_trigger.c | 11 --- 4 files changed, 203 insertions(+), 208 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 038c6c84c1..dbaf5433b0 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -27,9 +27,11 @@ extern LONG dll_ref DECLSPEC_HIDDEN; typedef struct ClassFactoryImpl ClassFactoryImpl; extern ClassFactoryImpl MSTASK_ClassFactory DECLSPEC_HIDDEN; -extern HRESULT TaskTriggerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT TaskTriggerConstructor(ITask *task, WORD idx, ITaskTrigger **trigger) DECLSPEC_HIDDEN; extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; extern HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **task) DECLSPEC_HIDDEN; +extern HRESULT task_set_trigger(ITask *task, WORD idx, const TASK_TRIGGER *trigger) DECLSPEC_HIDDEN; +extern HRESULT task_get_trigger(ITask *task, WORD idx, TASK_TRIGGER *trigger) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 68452afa4f..5129d9a513 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "objbase.h" #include "taskschd.h" #include "mstask.h" @@ -144,15 +145,176 @@ static ULONG WINAPI MSTASK_ITask_Release( return ref; } +HRESULT task_set_trigger(ITask *task, WORD idx, const TASK_TRIGGER *src) +{ + TaskImpl *This = impl_from_ITask(task); + TIME_FIELDS field_time; + LARGE_INTEGER sys_time; + TASK_TRIGGER dst; + + TRACE("(%p, %u, %p)\n", task, idx, src); + + if (idx >= This->trigger_count) + return E_FAIL; + + /* Verify valid structure size */ + if (src->cbTriggerSize != sizeof(*src)) + return E_INVALIDARG; + dst.cbTriggerSize = src->cbTriggerSize; + + /* Reserved field must be zero */ + dst.Reserved1 = 0; + + /* Verify and set valid start date and time */ + memset(&field_time, 0, sizeof(field_time)); + field_time.Year = src->wBeginYear; + field_time.Month = src->wBeginMonth; + field_time.Day = src->wBeginDay; + field_time.Hour = src->wStartHour; + field_time.Minute = src->wStartMinute; + if (!RtlTimeFieldsToTime(&field_time, &sys_time)) + return E_INVALIDARG; + dst.wBeginYear = src->wBeginYear; + dst.wBeginMonth = src->wBeginMonth; + dst.wBeginDay = src->wBeginDay; + dst.wStartHour = src->wStartHour; + dst.wStartMinute = src->wStartMinute; + + /* Verify valid end date if TASK_TRIGGER_FLAG_HAS_END_DATE flag is set */ + if (src->rgFlags & TASK_TRIGGER_FLAG_HAS_END_DATE) + { + memset(&field_time, 0, sizeof(field_time)); + field_time.Year = src->wEndYear; + field_time.Month = src->wEndMonth; + field_time.Day = src->wEndDay; + if (!RtlTimeFieldsToTime(&field_time, &sys_time)) + return E_INVALIDARG; + } + + /* Set valid end date independent of TASK_TRIGGER_FLAG_HAS_END_DATE flag */ + dst.wEndYear = src->wEndYear; + dst.wEndMonth = src->wEndMonth; + dst.wEndDay = src->wEndDay; + + /* Verify duration and interval pair */ + if (src->MinutesDuration <= src->MinutesInterval && src->MinutesInterval > 0) + return E_INVALIDARG; + dst.MinutesDuration = src->MinutesDuration; + dst.MinutesInterval = src->MinutesInterval; + + /* Copy over flags */ + dst.rgFlags = src->rgFlags; + + /* Set TriggerType dependent fields of Type union */ + dst.TriggerType = src->TriggerType; + switch (src->TriggerType) + { + case TASK_TIME_TRIGGER_DAILY: + dst.Type.Daily.DaysInterval = src->Type.Daily.DaysInterval; + break; + case TASK_TIME_TRIGGER_WEEKLY: + dst.Type.Weekly.WeeksInterval = src->Type.Weekly.WeeksInterval; + dst.Type.Weekly.rgfDaysOfTheWeek = src->Type.Weekly.rgfDaysOfTheWeek; + break; + case TASK_TIME_TRIGGER_MONTHLYDATE: + dst.Type.MonthlyDate.rgfDays = src->Type.MonthlyDate.rgfDays; + dst.Type.MonthlyDate.rgfMonths = src->Type.MonthlyDate.rgfMonths; + break; + case TASK_TIME_TRIGGER_MONTHLYDOW: + dst.Type.MonthlyDOW.wWhichWeek = src->Type.MonthlyDOW.wWhichWeek; + dst.Type.MonthlyDOW.rgfDaysOfTheWeek = src->Type.MonthlyDOW.rgfDaysOfTheWeek; + dst.Type.MonthlyDOW.rgfMonths = src->Type.MonthlyDOW.rgfMonths; + break; + case TASK_TIME_TRIGGER_ONCE: + case TASK_EVENT_TRIGGER_ON_IDLE: + case TASK_EVENT_TRIGGER_AT_SYSTEMSTART: + case TASK_EVENT_TRIGGER_AT_LOGON: + default: + dst.Type = src->Type; + break; + } + + /* Reserved field must be zero */ + dst.Reserved2 = 0; + + /* wRandomMinutesInterval not currently used and is initialized to zero */ + dst.wRandomMinutesInterval = 0; + + This->trigger[idx] = dst; + + return S_OK; +} + +HRESULT task_get_trigger(ITask *task, WORD idx, TASK_TRIGGER *dst) +{ + TaskImpl *This = impl_from_ITask(task); + TASK_TRIGGER *src; + + TRACE("(%p, %u, %p)\n", task, idx, dst); + + if (idx >= This->trigger_count) + return SCHED_E_TRIGGER_NOT_FOUND; + + src = &This->trigger[idx]; + + /* Native implementation doesn't verify equivalent cbTriggerSize fields */ + + /* Copy relevant fields of the structure */ + dst->cbTriggerSize = src->cbTriggerSize; + dst->Reserved1 = 0; + dst->wBeginYear = src->wBeginYear; + dst->wBeginMonth = src->wBeginMonth; + dst->wBeginDay = src->wBeginDay; + dst->wEndYear = src->wEndYear; + dst->wEndMonth = src->wEndMonth; + dst->wEndDay = src->wEndDay; + dst->wStartHour = src->wStartHour; + dst->wStartMinute = src->wStartMinute; + dst->MinutesDuration = src->MinutesDuration; + dst->MinutesInterval = src->MinutesInterval; + dst->rgFlags = src->rgFlags; + dst->TriggerType = src->TriggerType; + switch (src->TriggerType) + { + case TASK_TIME_TRIGGER_DAILY: + dst->Type.Daily.DaysInterval = src->Type.Daily.DaysInterval; + break; + case TASK_TIME_TRIGGER_WEEKLY: + dst->Type.Weekly.WeeksInterval = src->Type.Weekly.WeeksInterval; + dst->Type.Weekly.rgfDaysOfTheWeek = src->Type.Weekly.rgfDaysOfTheWeek; + break; + case TASK_TIME_TRIGGER_MONTHLYDATE: + dst->Type.MonthlyDate.rgfDays = src->Type.MonthlyDate.rgfDays; + dst->Type.MonthlyDate.rgfMonths = src->Type.MonthlyDate.rgfMonths; + break; + case TASK_TIME_TRIGGER_MONTHLYDOW: + dst->Type.MonthlyDOW.wWhichWeek = src->Type.MonthlyDOW.wWhichWeek; + dst->Type.MonthlyDOW.rgfDaysOfTheWeek = src->Type.MonthlyDOW.rgfDaysOfTheWeek; + dst->Type.MonthlyDOW.rgfMonths = src->Type.MonthlyDOW.rgfMonths; + break; + case TASK_TIME_TRIGGER_ONCE: + case TASK_EVENT_TRIGGER_ON_IDLE: + case TASK_EVENT_TRIGGER_AT_SYSTEMSTART: + case TASK_EVENT_TRIGGER_AT_LOGON: + default: + break; + } + dst->Reserved2 = 0; + dst->wRandomMinutesInterval = 0; + + return S_OK; +} + static HRESULT WINAPI MSTASK_ITask_CreateTrigger(ITask *iface, WORD *idx, ITaskTrigger **task_trigger) { TaskImpl *This = impl_from_ITask(iface); TASK_TRIGGER *new_trigger; + SYSTEMTIME time; HRESULT hr; TRACE("(%p, %p, %p)\n", iface, idx, task_trigger); - hr = TaskTriggerConstructor((void **)task_trigger); + hr = TaskTriggerConstructor(iface, This->trigger_count, task_trigger); if (hr != S_OK) return hr; if (This->trigger) @@ -167,9 +329,22 @@ static HRESULT WINAPI MSTASK_ITask_CreateTrigger(ITask *iface, WORD *idx, ITaskT This->trigger = new_trigger; - hr = ITaskTrigger_GetTrigger(*task_trigger, &This->trigger[This->trigger_count]); - if (hr == S_OK) - *idx = This->trigger_count++; + new_trigger = &This->trigger[This->trigger_count]; + + /* Most fields default to zero. Initialize other fields to default values. */ + memset(new_trigger, 0, sizeof(*new_trigger)); + GetLocalTime(&time); + new_trigger->cbTriggerSize = sizeof(*new_trigger); + new_trigger->wBeginYear = time.wYear; + new_trigger->wBeginMonth = time.wMonth; + new_trigger->wBeginDay = time.wDay; + new_trigger->wStartHour = time.wHour; + new_trigger->wStartMinute = time.wMinute; + new_trigger->rgFlags = TASK_TRIGGER_FLAG_DISABLED; + new_trigger->TriggerType = TASK_TIME_TRIGGER_DAILY, + new_trigger->Type.Daily.DaysInterval = 1; + + *idx = This->trigger_count++; return hr; } @@ -204,21 +379,13 @@ static HRESULT WINAPI MSTASK_ITask_GetTriggerCount(ITask *iface, WORD *count) static HRESULT WINAPI MSTASK_ITask_GetTrigger(ITask *iface, WORD idx, ITaskTrigger **trigger) { TaskImpl *This = impl_from_ITask(iface); - HRESULT hr; TRACE("(%p, %u, %p)\n", iface, idx, trigger); if (idx >= This->trigger_count) return SCHED_E_TRIGGER_NOT_FOUND; - hr = TaskTriggerConstructor((void **)trigger); - if (hr != S_OK) return hr; - - hr = ITaskTrigger_SetTrigger(*trigger, &This->trigger[idx]); - if (hr != S_OK) - ITaskTrigger_Release(*trigger); - - return hr; + return TaskTriggerConstructor(iface, idx, trigger); } static HRESULT WINAPI MSTASK_ITask_GetTriggerString( diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 0f24e1f998..e3f190a315 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -23,7 +23,6 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" -#include "winternl.h" #include "taskschd.h" #include "mstask.h" #include "mstask_private.h" @@ -35,7 +34,8 @@ typedef struct { ITaskTrigger ITaskTrigger_iface; LONG ref; - TASK_TRIGGER triggerCond; + ITask *parent_task; + WORD trigger_index; } TaskTriggerImpl; static inline TaskTriggerImpl *impl_from_ITaskTrigger(ITaskTrigger *iface) @@ -86,186 +86,33 @@ static ULONG WINAPI MSTASK_ITaskTrigger_Release( ref = InterlockedDecrement(&This->ref); if (ref == 0) { + ITask_Release(This->parent_task); heap_free(This); InterlockedDecrement(&dll_ref); } return ref; } -static HRESULT WINAPI MSTASK_ITaskTrigger_SetTrigger( - ITaskTrigger* iface, - const PTASK_TRIGGER pTrigger) +static HRESULT WINAPI MSTASK_ITaskTrigger_SetTrigger(ITaskTrigger *iface, const PTASK_TRIGGER trigger) { - TaskTriggerImpl * This = impl_from_ITaskTrigger(iface); - TIME_FIELDS field_time; - LARGE_INTEGER sys_time; - TASK_TRIGGER tmp_trigger_cond; - - TRACE("(%p, %p)\n", iface, pTrigger); - - if (!pTrigger) return E_INVALIDARG; - - /* Verify valid structure size */ - if (pTrigger->cbTriggerSize != sizeof(*pTrigger)) - return E_INVALIDARG; - tmp_trigger_cond.cbTriggerSize = pTrigger->cbTriggerSize; - - /* Reserved field must be zero */ - tmp_trigger_cond.Reserved1 = 0; - - /* Verify and set valid start date and time */ - memset(&field_time, 0, sizeof(field_time)); - field_time.Year = pTrigger->wBeginYear; - field_time.Month = pTrigger->wBeginMonth; - field_time.Day = pTrigger->wBeginDay; - field_time.Hour = pTrigger->wStartHour; - field_time.Minute = pTrigger->wStartMinute; - if (!RtlTimeFieldsToTime(&field_time, &sys_time)) - return E_INVALIDARG; - tmp_trigger_cond.wBeginYear = pTrigger->wBeginYear; - tmp_trigger_cond.wBeginMonth = pTrigger->wBeginMonth; - tmp_trigger_cond.wBeginDay = pTrigger->wBeginDay; - tmp_trigger_cond.wStartHour = pTrigger->wStartHour; - tmp_trigger_cond.wStartMinute = pTrigger->wStartMinute; - - /* Verify valid end date if TASK_TRIGGER_FLAG_HAS_END_DATE flag is set */ - if (pTrigger->rgFlags & TASK_TRIGGER_FLAG_HAS_END_DATE) - { - memset(&field_time, 0, sizeof(field_time)); - field_time.Year = pTrigger->wEndYear; - field_time.Month = pTrigger->wEndMonth; - field_time.Day = pTrigger->wEndDay; - if (!RtlTimeFieldsToTime(&field_time, &sys_time)) - return E_INVALIDARG; - } - - /* Set valid end date independent of TASK_TRIGGER_FLAG_HAS_END_DATE flag */ - tmp_trigger_cond.wEndYear = pTrigger->wEndYear; - tmp_trigger_cond.wEndMonth = pTrigger->wEndMonth; - tmp_trigger_cond.wEndDay = pTrigger->wEndDay; - - /* Verify duration and interval pair */ - if (pTrigger->MinutesDuration <= pTrigger->MinutesInterval && - pTrigger->MinutesInterval > 0) - return E_INVALIDARG; - tmp_trigger_cond.MinutesDuration = pTrigger->MinutesDuration; - tmp_trigger_cond.MinutesInterval = pTrigger->MinutesInterval; - - /* Copy over flags */ - tmp_trigger_cond.rgFlags = pTrigger->rgFlags; - - /* Set TriggerType dependent fields of Type union */ - tmp_trigger_cond.TriggerType = pTrigger->TriggerType; - switch (pTrigger->TriggerType) - { - case TASK_TIME_TRIGGER_DAILY: - tmp_trigger_cond.Type.Daily.DaysInterval = - pTrigger->Type.Daily.DaysInterval; - break; - case TASK_TIME_TRIGGER_WEEKLY: - tmp_trigger_cond.Type.Weekly.WeeksInterval = - pTrigger->Type.Weekly.WeeksInterval; - tmp_trigger_cond.Type.Weekly.rgfDaysOfTheWeek = - pTrigger->Type.Weekly.rgfDaysOfTheWeek; - break; - case TASK_TIME_TRIGGER_MONTHLYDATE: - tmp_trigger_cond.Type.MonthlyDate.rgfDays = - pTrigger->Type.MonthlyDate.rgfDays; - tmp_trigger_cond.Type.MonthlyDate.rgfMonths = - pTrigger->Type.MonthlyDate.rgfMonths; - break; - case TASK_TIME_TRIGGER_MONTHLYDOW: - tmp_trigger_cond.Type.MonthlyDOW.wWhichWeek = - pTrigger->Type.MonthlyDOW.wWhichWeek; - tmp_trigger_cond.Type.MonthlyDOW.rgfDaysOfTheWeek = - pTrigger->Type.MonthlyDOW.rgfDaysOfTheWeek; - tmp_trigger_cond.Type.MonthlyDOW.rgfMonths = - pTrigger->Type.MonthlyDOW.rgfMonths; - break; - case TASK_TIME_TRIGGER_ONCE: - case TASK_EVENT_TRIGGER_ON_IDLE: - case TASK_EVENT_TRIGGER_AT_SYSTEMSTART: - case TASK_EVENT_TRIGGER_AT_LOGON: - default: - tmp_trigger_cond.Type = This->triggerCond.Type; - break; - } - - /* Reserved field must be zero */ - tmp_trigger_cond.Reserved2 = 0; + TaskTriggerImpl *This = impl_from_ITaskTrigger(iface); - /* wRandomMinutesInterval not currently used and is initialized to zero */ - tmp_trigger_cond.wRandomMinutesInterval = 0; + TRACE("(%p, %p)\n", iface, trigger); - /* Update object copy of triggerCond */ - This->triggerCond = tmp_trigger_cond; + if (!trigger) return E_INVALIDARG; - return S_OK; + return task_set_trigger(This->parent_task, This->trigger_index, trigger); } -static HRESULT WINAPI MSTASK_ITaskTrigger_GetTrigger( - ITaskTrigger* iface, - PTASK_TRIGGER pTrigger) +static HRESULT WINAPI MSTASK_ITaskTrigger_GetTrigger(ITaskTrigger *iface, TASK_TRIGGER *trigger) { - TaskTriggerImpl * This = impl_from_ITaskTrigger(iface); - - TRACE("(%p, %p)\n", iface, pTrigger); + TaskTriggerImpl *This = impl_from_ITaskTrigger(iface); - if (!pTrigger) return E_INVALIDARG; + TRACE("(%p, %p)\n", iface, trigger); - /* Native implementation doesn't verify equivalent cbTriggerSize fields */ + if (!trigger) return E_INVALIDARG; - /* Copy relevant fields of the structure */ - pTrigger->cbTriggerSize = This->triggerCond.cbTriggerSize; - pTrigger->Reserved1 = 0; - pTrigger->wBeginYear = This->triggerCond.wBeginYear; - pTrigger->wBeginMonth = This->triggerCond.wBeginMonth; - pTrigger->wBeginDay = This->triggerCond.wBeginDay; - pTrigger->wEndYear = This->triggerCond.wEndYear; - pTrigger->wEndMonth = This->triggerCond.wEndMonth; - pTrigger->wEndDay = This->triggerCond.wEndDay; - pTrigger->wStartHour = This->triggerCond.wStartHour; - pTrigger->wStartMinute = This->triggerCond.wStartMinute; - pTrigger->MinutesDuration = This->triggerCond.MinutesDuration; - pTrigger->MinutesInterval = This->triggerCond.MinutesInterval; - pTrigger->rgFlags = This->triggerCond.rgFlags; - pTrigger->TriggerType = This->triggerCond.TriggerType; - switch (This->triggerCond.TriggerType) - { - case TASK_TIME_TRIGGER_DAILY: - pTrigger->Type.Daily.DaysInterval = - This->triggerCond.Type.Daily.DaysInterval; - break; - case TASK_TIME_TRIGGER_WEEKLY: - pTrigger->Type.Weekly.WeeksInterval = - This->triggerCond.Type.Weekly.WeeksInterval; - pTrigger->Type.Weekly.rgfDaysOfTheWeek = - This->triggerCond.Type.Weekly.rgfDaysOfTheWeek; - break; - case TASK_TIME_TRIGGER_MONTHLYDATE: - pTrigger->Type.MonthlyDate.rgfDays = - This->triggerCond.Type.MonthlyDate.rgfDays; - pTrigger->Type.MonthlyDate.rgfMonths = - This->triggerCond.Type.MonthlyDate.rgfMonths; - break; - case TASK_TIME_TRIGGER_MONTHLYDOW: - pTrigger->Type.MonthlyDOW.wWhichWeek = - This->triggerCond.Type.MonthlyDOW.wWhichWeek; - pTrigger->Type.MonthlyDOW.rgfDaysOfTheWeek = - This->triggerCond.Type.MonthlyDOW.rgfDaysOfTheWeek; - pTrigger->Type.MonthlyDOW.rgfMonths = - This->triggerCond.Type.MonthlyDOW.rgfMonths; - break; - case TASK_TIME_TRIGGER_ONCE: - case TASK_EVENT_TRIGGER_ON_IDLE: - case TASK_EVENT_TRIGGER_AT_SYSTEMSTART: - case TASK_EVENT_TRIGGER_AT_LOGON: - default: - break; - } - pTrigger->Reserved2 = 0; - pTrigger->wRandomMinutesInterval = 0; - return S_OK; + return task_get_trigger(This->parent_task, This->trigger_index, trigger); } static HRESULT WINAPI MSTASK_ITaskTrigger_GetTriggerString( @@ -286,11 +133,11 @@ static const ITaskTriggerVtbl MSTASK_ITaskTriggerVtbl = MSTASK_ITaskTrigger_GetTriggerString }; -HRESULT TaskTriggerConstructor(LPVOID *ppObj) +HRESULT TaskTriggerConstructor(ITask *task, WORD idx, ITaskTrigger **trigger) { TaskTriggerImpl *This; - SYSTEMTIME time; - TRACE("(%p)\n", ppObj); + + TRACE("(%p, %u, %p)\n", task, idx, trigger); This = heap_alloc(sizeof(*This)); if (!This) @@ -299,21 +146,11 @@ HRESULT TaskTriggerConstructor(LPVOID *ppObj) This->ITaskTrigger_iface.lpVtbl = &MSTASK_ITaskTriggerVtbl; This->ref = 1; - /* Most fields of triggerCond default to zero. Initialize other - * fields to default values. */ - memset(&This->triggerCond, 0, sizeof(TASK_TRIGGER)); - GetLocalTime(&time); - This->triggerCond.cbTriggerSize = sizeof(This->triggerCond); - This->triggerCond.wBeginYear = time.wYear; - This->triggerCond.wBeginMonth = time.wMonth; - This->triggerCond.wBeginDay = time.wDay; - This->triggerCond.wStartHour = time.wHour; - This->triggerCond.wStartMinute = time.wMinute; - This->triggerCond.rgFlags = TASK_TRIGGER_FLAG_DISABLED; - This->triggerCond.TriggerType = TASK_TIME_TRIGGER_DAILY, - This->triggerCond.Type.Daily.DaysInterval = 1; + ITask_AddRef(task); + This->parent_task = task; + This->trigger_index = idx; - *ppObj = &This->ITaskTrigger_iface; + *trigger = &This->ITaskTrigger_iface; InterlockedIncrement(&dll_ref); return S_OK; } diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index ab99af7b5d..9a20a5672c 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -499,14 +499,12 @@ static void test_trigger_manager(void) hr = ITask_CreateTrigger(task, &idx, &trigger0); ok(hr == S_OK, "got %#x\n", hr); ok(idx == 0, "got %u\n", idx); -todo_wine ok(obj_refcount(task) == 2, "got %u\n", obj_refcount(task)); idx = 0xdead; hr = ITask_CreateTrigger(task, &idx, &trigger1); ok(hr == S_OK, "got %#x\n", hr); ok(idx == 1, "got %u\n", idx); -todo_wine ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); count = 0xdead; @@ -524,9 +522,7 @@ todo_wine hr = get_task_trigger(task, 0, &state); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); -todo_wine ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); hr = ITaskTrigger_GetTrigger(trigger1, &state1); @@ -539,7 +535,6 @@ todo_wine hr = get_task_trigger(task, 1, &state); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); @@ -552,14 +547,11 @@ todo_wine hr = get_task_trigger(task, 0, &state); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); -todo_wine ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); hr = get_task_trigger(task, 1, &state); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); @@ -573,7 +565,6 @@ todo_wine hr = get_task_trigger(task, 0, &state); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); @@ -584,7 +575,6 @@ todo_wine ok(hr == S_OK, "got %#x\n", hr); hr = ITaskTrigger_SetTrigger(trigger1, &state1); -todo_wine ok(hr == E_FAIL, "got %#x\n", hr); count = 0xdead; @@ -592,7 +582,6 @@ todo_wine ok(hr == S_OK, "got %#x\n", hr); ok(count == 1, "got %u\n", count); -todo_wine ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); ref = ITaskTrigger_Release(trigger0); -- 2.16.3

1 0

[PATCH 6/7] mstask/tests: Add another set of tests for trigger management.
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_trigger.c | 153 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index fe757e812a..ab99af7b5d 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -28,6 +28,13 @@ static ITaskScheduler *test_task_scheduler; +static DWORD obj_refcount(void *obj_to_check) +{ + IUnknown *obj = obj_to_check; + IUnknown_AddRef(obj); + return IUnknown_Release(obj); +} + static BOOL compare_trigger_state(TASK_TRIGGER found_state, TASK_TRIGGER expected_state) { @@ -453,6 +460,151 @@ static void test_GetNextRunTime(void) ITask_Release(task); } +static HRESULT get_task_trigger(ITask *task, WORD idx, TASK_TRIGGER *state) +{ + HRESULT hr; + ITaskTrigger *trigger; + + hr = ITask_GetTrigger(task, idx, &trigger); + if (hr != S_OK) return hr; + + memset(state, 0x11, sizeof(*state)); + hr = ITaskTrigger_GetTrigger(trigger, state); + + ITaskTrigger_Release(trigger); + return hr; +} + +static void test_trigger_manager(void) +{ + static const WCHAR task_name[] = { 'T','e','s','t','i','n','g',0 }; + HRESULT hr; + ITask *task; + ITaskTrigger *trigger0, *trigger1; + TASK_TRIGGER state0, state1, state; + WORD count, idx; + DWORD ref; + + hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + ok(obj_refcount(task) == 1, "got %u\n", obj_refcount(task)); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 0, "got %u\n", count); + + idx = 0xdead; + hr = ITask_CreateTrigger(task, &idx, &trigger0); + ok(hr == S_OK, "got %#x\n", hr); + ok(idx == 0, "got %u\n", idx); +todo_wine + ok(obj_refcount(task) == 2, "got %u\n", obj_refcount(task)); + + idx = 0xdead; + hr = ITask_CreateTrigger(task, &idx, &trigger1); + ok(hr == S_OK, "got %#x\n", hr); + ok(idx == 1, "got %u\n", idx); +todo_wine + ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 2, "got %u\n", count); + + hr = ITaskTrigger_GetTrigger(trigger0, &state0); + ok(hr == S_OK, "got %#x\n", hr); + state0.wBeginYear = 3000; + state0.rgFlags = 0; + state0.TriggerType = TASK_TIME_TRIGGER_ONCE; + hr = ITaskTrigger_SetTrigger(trigger0, &state0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = get_task_trigger(task, 0, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); +todo_wine + ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); + + hr = ITaskTrigger_GetTrigger(trigger1, &state1); + ok(hr == S_OK, "got %#x\n", hr); + state1.wBeginYear = 2000; + state1.rgFlags = 0; + state1.TriggerType = TASK_TIME_TRIGGER_DAILY; + hr = ITaskTrigger_SetTrigger(trigger1, &state1); + ok(hr == S_OK, "got %#x\n", hr); + + hr = get_task_trigger(task, 1, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); + ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); + + ref = ITaskTrigger_Release(trigger0); + ok(ref == 0, "got %u\n", ref); + ref = ITaskTrigger_Release(trigger1); + ok(ref == 0, "got %u\n", ref); + + ok(obj_refcount(task) == 1, "got %u\n", obj_refcount(task)); + + hr = get_task_trigger(task, 0, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); +todo_wine + ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); + + hr = get_task_trigger(task, 1, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); + ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); + + hr = ITask_GetTrigger(task, 0, &trigger0); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITask_GetTrigger(task, 1, &trigger1); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_DeleteTrigger(task, 0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = get_task_trigger(task, 0, &state); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); + ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); + + hr = get_task_trigger(task, 1, &state); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + + hr = ITaskTrigger_SetTrigger(trigger0, &state0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITaskTrigger_SetTrigger(trigger1, &state1); +todo_wine + ok(hr == E_FAIL, "got %#x\n", hr); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 1, "got %u\n", count); + +todo_wine + ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); + + ref = ITaskTrigger_Release(trigger0); + ok(ref == 0, "got %u\n", ref); + + ref = ITaskTrigger_Release(trigger1); + ok(ref == 0, "got %u\n", ref); + + ref = ITask_Release(task); + ok(ref == 0, "got %u\n", ref); +} + START_TEST(task_trigger) { HRESULT hr; @@ -466,6 +618,7 @@ START_TEST(task_trigger) test_SetTrigger_GetTrigger(); test_task_trigger(); test_GetNextRunTime(); + test_trigger_manager(); ITaskScheduler_Release(test_task_scheduler); CoUninitialize(); -- 2.16.3

1 0

[PATCH 5/7] mstask: ITaskTrigger::GetTrigger() should fail on NULL input.
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_trigger.c | 2 ++ dlls/mstask/tests/task_trigger.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 6d11817e00..0f24e1f998 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -211,6 +211,8 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_GetTrigger( TRACE("(%p, %p)\n", iface, pTrigger); + if (!pTrigger) return E_INVALIDARG; + /* Native implementation doesn't verify equivalent cbTriggerSize fields */ /* Copy relevant fields of the structure */ diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index e22b2ae2dd..fe757e812a 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -139,6 +139,9 @@ static void test_SetTrigger_GetTrigger(void) hres = ITaskTrigger_SetTrigger(test_trigger, NULL); ok(hres == E_INVALIDARG, "got %#x\n", hres); + hres = ITaskTrigger_GetTrigger(test_trigger, NULL); + ok(hres == E_INVALIDARG, "got %#x\n", hres); + /* Setup a trigger with base values for this test run */ GetLocalTime(&time); empty_trigger_state.wStartHour = time.wHour; -- 2.16.3

1 0

[PATCH 4/7] mstask: ITaskTrigger::SetTrigger() should fail on NULL input.
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_trigger.c | 2 ++ dlls/mstask/tests/task_trigger.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 888fb66a4f..6d11817e00 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -103,6 +103,8 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_SetTrigger( TRACE("(%p, %p)\n", iface, pTrigger); + if (!pTrigger) return E_INVALIDARG; + /* Verify valid structure size */ if (pTrigger->cbTriggerSize != sizeof(*pTrigger)) return E_INVALIDARG; diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 3e2762079d..e22b2ae2dd 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -136,6 +136,9 @@ static void test_SetTrigger_GetTrigger(void) hres = ITask_CreateTrigger(test_task, &idx, &test_trigger); ok(hres == S_OK, "got %#x\n", hres); + hres = ITaskTrigger_SetTrigger(test_trigger, NULL); + ok(hres == E_INVALIDARG, "got %#x\n", hres); + /* Setup a trigger with base values for this test run */ GetLocalTime(&time); empty_trigger_state.wStartHour = time.wHour; -- 2.16.3

1 0

[PATCH 3/7] mstask/tests: Make task trigger tests independent.
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_trigger.c | 54 +++++++++------------------------------- 1 file changed, 12 insertions(+), 42 deletions(-) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index ab081a74ca..3e2762079d 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -27,37 +27,6 @@ #include "wine/test.h" static ITaskScheduler *test_task_scheduler; -static ITask *test_task; -static ITaskTrigger *test_trigger; -static WORD trigger_index; - -static BOOL setup_trigger(void) -{ - HRESULT hres; - const WCHAR task_name[] = {'T','e','s','t','i','n','g', 0}; - - hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, - &CLSID_CTask, &IID_ITask, (IUnknown**)&test_task); - if(hres != S_OK) - { - ITaskScheduler_Release(test_task_scheduler); - return FALSE; - } - hres = ITask_CreateTrigger(test_task, &trigger_index, &test_trigger); - if(hres != S_OK) - { - ITask_Release(test_task); - ITaskScheduler_Release(test_task_scheduler); - return FALSE; - } - return TRUE; -} - -static void cleanup_trigger(void) -{ - ITaskTrigger_Release(test_trigger); - ITask_Release(test_task); -} static BOOL compare_trigger_state(TASK_TRIGGER found_state, TASK_TRIGGER expected_state) @@ -135,8 +104,11 @@ static BOOL compare_trigger_state(TASK_TRIGGER found_state, static void test_SetTrigger_GetTrigger(void) { - BOOL setup; + static const WCHAR task_name[] = { 'T','e','s','t','i','n','g',0 }; + ITask *test_task; + ITaskTrigger *test_trigger; HRESULT hres; + WORD idx; TASK_TRIGGER trigger_state; TASK_TRIGGER empty_trigger_state = { sizeof(trigger_state), 0, @@ -157,13 +129,12 @@ static void test_SetTrigger_GetTrigger(void) }; SYSTEMTIME time; - setup = setup_trigger(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "got %#x\n", hres); + + hres = ITask_CreateTrigger(test_task, &idx, &test_trigger); + ok(hres == S_OK, "got %#x\n", hres); /* Setup a trigger with base values for this test run */ GetLocalTime(&time); @@ -367,9 +338,8 @@ static void test_SetTrigger_GetTrigger(void) ok(compare_trigger_state(trigger_state, normal_trigger_state), "Invalid state\n"); - - cleanup_trigger(); - return; + ITaskTrigger_Release(test_trigger); + ITask_Release(test_task); } static void test_task_trigger(void) -- 2.16.3

1 0

[PATCH 2/7] mstask: Implement ITask::SetFlags().
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 11 +++++++---- dlls/mstask/tests/task.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 9cdf92e319..68452afa4f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -491,11 +491,14 @@ static HRESULT WINAPI MSTASK_ITask_GetErrorRetryInterval(ITask *iface, WORD *int return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_SetFlags( - ITask* iface, - DWORD dwFlags) +static HRESULT WINAPI MSTASK_ITask_SetFlags(ITask *iface, DWORD flags) { - FIXME("(%p, 0x%08x): stub\n", iface, dwFlags); + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, 0x%08x)\n", iface, flags); + This->flags &= 0xffff8000; + This->flags |= flags & 0x7fff; + This->is_dirty = TRUE; return S_OK; } diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 58c102060b..0e2b4339ad 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -683,6 +683,43 @@ static void test_Run(void) ok(hr == S_OK, "got %#x\n", hr); } +static void test_SetFlags(void) +{ + HRESULT hr; + ITask *task; + DWORD flags; + + hr = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_SetFlags(task, 0); + ok(hr == S_OK, "got %#x\n", hr); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(task, &flags); + ok(hr == S_OK, "got %#x\n", hr); + ok(flags == 0, "got %#x\n", flags); + + hr = ITask_SetFlags(task, 0xffffffff); + ok(hr == S_OK, "got %#x\n", hr); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(task, &flags); + ok(hr == S_OK, "got %#x\n", hr); + ok(flags == 0x7fff, "got %#x\n", flags); + + hr = ITask_SetFlags(task, 0x9234); + ok(hr == S_OK, "got %#x\n", hr); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(task, &flags); + ok(hr == S_OK, "got %#x\n", hr); + ok(flags == 0x1234, "got %#x\n", flags); + + ITask_Release(task); +} + START_TEST(task) { HRESULT hr; @@ -700,6 +737,7 @@ START_TEST(task) test_SetAccountInformation_GetAccountInformation(); test_task_state(); test_Run(); + test_SetFlags(); ITaskScheduler_Release(scheduler); CoUninitialize(); -- 2.16.3

1 0

[PATCH 1/7] mstask/tests: Make task tests independent.
by Dmitry Timoshkov 14 May '18

14 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task.c | 155 ++++++++++++++--------------------------------- 1 file changed, 46 insertions(+), 109 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 2e8ee93630..58c102060b 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -25,35 +25,10 @@ #include "mstask.h" #include "wine/test.h" -static ITaskScheduler *test_task_scheduler; -static ITask *test_task; +static ITaskScheduler *scheduler; +static const WCHAR task_name[] = {'T','e','s','t','i','n','g',0}; static const WCHAR empty[] = {0}; -static BOOL setup_task(void) -{ - HRESULT hres; - const WCHAR task_name[] = {'T','e','s','t','i','n','g', 0}; - - hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, - &IID_ITaskScheduler, (void **) &test_task_scheduler); - if(hres != S_OK) - return FALSE; - hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, - &IID_ITask, (IUnknown**)&test_task); - if(hres != S_OK) - { - ITaskScheduler_Release(test_task_scheduler); - return FALSE; - } - return TRUE; -} - -static void cleanup_task(void) -{ - ITask_Release(test_task); - ITaskScheduler_Release(test_task_scheduler); -} - static LPCWSTR path_resolve_name(LPCWSTR base_name) { static WCHAR buffer[MAX_PATH]; @@ -72,7 +47,7 @@ static LPCWSTR path_resolve_name(LPCWSTR base_name) static void test_SetApplicationName_GetApplicationName(void) { - BOOL setup; + ITask *test_task; HRESULT hres; LPWSTR stored_name; LPCWSTR full_name; @@ -82,13 +57,9 @@ static void test_SetApplicationName_GetApplicationName(void) 'n','o','t','e','p','a','d','.','e','x','e', 0}; const WCHAR notepad[] = {'n','o','t','e','p','a','d', 0}; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Attempt getting before setting application name */ hres = ITask_GetApplicationName(test_task, &stored_name); @@ -176,54 +147,39 @@ static void test_SetApplicationName_GetApplicationName(void) CoTaskMemFree(stored_name); } - cleanup_task(); - return; + ITask_Release(test_task); } static void test_CreateTrigger(void) { - BOOL setup; + ITask *test_task; HRESULT hres; WORD trigger_index; ITaskTrigger *test_trigger; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); hres = ITask_CreateTrigger(test_task, &trigger_index, &test_trigger); ok(hres == S_OK, "Failed to create trigger: 0x%08x\n", hres); - if (hres != S_OK) - { - cleanup_task(); - return; - } ITaskTrigger_Release(test_trigger); - cleanup_task(); - return; + ITask_Release(test_task); } static void test_SetParameters_GetParameters(void) { - BOOL setup; + ITask *test_task; HRESULT hres; LPWSTR parameters; const WCHAR parameters_a[] = {'f','o','o','.','t','x','t', 0}; const WCHAR parameters_b[] = {'f','o','o','.','t','x','t',' ', 'b','a','r','.','t','x','t', 0}; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Get parameters before setting them */ hres = ITask_GetParameters(test_task, &parameters); @@ -274,26 +230,21 @@ static void test_SetParameters_GetParameters(void) CoTaskMemFree(parameters); } - cleanup_task(); - return; + ITask_Release(test_task); } static void test_SetComment_GetComment(void) { - BOOL setup; + ITask *test_task; HRESULT hres; LPWSTR comment; const WCHAR comment_a[] = {'C','o','m','m','e','n','t','.', 0}; const WCHAR comment_b[] = {'L','o','n','g','e','r',' ', 'c','o','m','m','e','n','t','.', 0}; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Get comment before setting it*/ hres = ITask_GetComment(test_task, &comment); @@ -344,23 +295,18 @@ static void test_SetComment_GetComment(void) CoTaskMemFree(comment); } - cleanup_task(); - return; + ITask_Release(test_task); } static void test_SetMaxRunTime_GetMaxRunTime(void) { - BOOL setup; + ITask *test_task; HRESULT hres; DWORD max_run_time; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Default time is 3 days: * 3 days * 24 hours * 60 minutes * 60 seconds * 1000 ms = 259200000 */ @@ -401,13 +347,12 @@ static void test_SetMaxRunTime_GetMaxRunTime(void) ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); ok(max_run_time == INFINITE, "Expected INFINITE: %d\n", max_run_time); - cleanup_task(); - return; + ITask_Release(test_task); } static void test_SetAccountInformation_GetAccountInformation(void) { - BOOL setup; + ITask *test_task; HRESULT hres; LPWSTR account_name; const WCHAR dummy_account_name[] = {'N', 'o', 'S', 'u', 'c', 'h', @@ -415,13 +360,9 @@ static void test_SetAccountInformation_GetAccountInformation(void) const WCHAR dummy_account_name_b[] = {'N', 'o', 'S', 'u', 'c', 'h', 'A', 'c', 'c', 'o', 'u', 'n', 't', 'B', 0}; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Get account information before it is set */ hres = ITask_GetAccountInformation(test_task, &account_name); @@ -431,8 +372,7 @@ static void test_SetAccountInformation_GetAccountInformation(void) if (hres == SCHED_E_NO_SECURITY_SERVICES || hres == SCHED_E_SERVICE_NOT_RUNNING) { win_skip("Security services are not supported\n"); - cleanup_task(); - return; + ITask_Release(test_task); } ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK, @@ -493,25 +433,20 @@ static void test_SetAccountInformation_GetAccountInformation(void) CoTaskMemFree(account_name); } - cleanup_task(); - return; + ITask_Release(test_task); } static void test_task_state(void) { - BOOL setup; + ITask *test_task; HRESULT hr, status; DWORD flags, val; WORD val1, val2; SYSTEMTIME st; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hr = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hr == S_OK, "Failed to setup test_task\n"); if (0) /* crashes under Windows */ hr = ITask_GetFlags(test_task, NULL); @@ -588,7 +523,7 @@ static void test_task_state(void) ok(st.wMinute == 0, "got %u\n", st.wMinute); ok(st.wSecond == 0, "got %u\n", st.wSecond); - cleanup_task(); + ITask_Release(test_task); } static void save_job(ITask *task) @@ -609,7 +544,6 @@ static void test_Run(void) { static const WCHAR wine_test_runW[] = { 'w','i','n','e','_','t','e','s','t','_','r','u','n',0 }; static const WCHAR cmdW[] = { 'c','m','d','.','e','x','e',0 }; - ITaskScheduler *scheduler; ITask *task; ITaskTrigger *trigger; WORD idx, i; @@ -617,10 +551,6 @@ static void test_Run(void) SYSTEMTIME st; HRESULT hr, status; - hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, - &IID_ITaskScheduler, (void **)&scheduler); - ok(hr == S_OK, "got %#x\n", hr); - /* cleanup after previous runs */ ITaskScheduler_Delete(scheduler, wine_test_runW); @@ -751,12 +681,17 @@ static void test_Run(void) hr = ITaskScheduler_Delete(scheduler, wine_test_runW); ok(hr == S_OK, "got %#x\n", hr); - ITaskScheduler_Release(scheduler); } START_TEST(task) { + HRESULT hr; + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **)&scheduler); + ok(hr == S_OK, "failed to create task scheduler: %#x\n", hr); + test_SetApplicationName_GetApplicationName(); test_CreateTrigger(); test_SetParameters_GetParameters(); @@ -765,5 +700,7 @@ START_TEST(task) test_SetAccountInformation_GetAccountInformation(); test_task_state(); test_Run(); + + ITaskScheduler_Release(scheduler); CoUninitialize(); } -- 2.16.3

1 0

[PATCH] gdi32/tests: Check array index limit first.
by Andrey Gusev 14 May '18

14 May '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/gdi32/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6243a6d339..2b214a07aa 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -202,7 +202,7 @@ static void check_font(const char* test, const LOGFONTA* lf, HFONT hfont) ret = GetObjectA(hfont, sizeof(getobj_lf), &getobj_lf); /* NT4 tries to be clever and only returns the minimum length */ - while (lf->lfFaceName[minlen] && minlen < LF_FACESIZE-1) + while (minlen < LF_FACESIZE-1 && lf->lfFaceName[minlen]) minlen++; minlen += FIELD_OFFSET(LOGFONTA, lfFaceName) + 1; ok(ret == sizeof(LOGFONTA) || ret == minlen, "%s: GetObject returned %d\n", test, ret); -- 2.14.3

3 2

[PATCH] Add PLATFORM_OPENBSD to winebuild.
by Daniel Dickman 14 May '18

14 May '18

--- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 2 ++ tools/winebuild/utils.c | 3 +++ 3 files changed, 6 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 90e8e34e44..9596743406 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -150,6 +150,7 @@ enum target_platform PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_FREEBSD, + PLATFORM_OPENBSD, PLATFORM_SOLARIS, PLATFORM_WINDOWS }; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index f4656f9051..1188bf89fd 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -65,6 +65,8 @@ enum target_cpu target_cpu = CPU_ARM64; enum target_platform target_platform = PLATFORM_APPLE; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) enum target_platform target_platform = PLATFORM_FREEBSD; +#elif defined(__OpenBSD__) +enum target_platform target_platform = PLATFORM_OPENBSD; #elif defined(__sun) enum target_platform target_platform = PLATFORM_SOLARIS; #elif defined(_WIN32) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 6e01f1a526..bcebdc08ad 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -445,6 +445,9 @@ struct strarray get_ld_command(void) case PLATFORM_FREEBSD: strarray_add( &args, "-m", (force_pointer_size == 8) ? "elf_x86_64_fbsd" : "elf_i386_fbsd", NULL ); break; + case PLATFORM_OPENBSD: + strarray_add( &args, "-m", (force_pointer_size == 8) ? "elf_x86_64_obsd" : "elf_i386_obsd", NULL ); + break; default: switch(target_cpu) { -- 2.16.2

1 0

[PATCH] secur32: Set output buffer size to zero during handshake when no data needs to be sent.
by Alistair Leslie-Hughes 14 May '18

14 May '18

From: Michael Müller <michael(a)fds-team.de> Fixes: https://bugs.winehq.org/show_bug.cgi?id=40271 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel.c | 19 ++++++++++++------- dlls/secur32/tests/schannel.c | 10 ++++++++-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 90b9782..f0d271e 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -901,6 +901,18 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( /* Perform the TLS handshake */ ret = schan_imp_handshake(ctx->session); + out_buffers = &ctx->transport.out; + if (out_buffers->current_buffer_idx != -1) + { + SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx]; + buffer->cbBuffer = out_buffers->offset; + } + else if (out_buffers->desc && out_buffers->desc->cBuffers > 0) + { + SecBuffer *buffer = &out_buffers->desc->pBuffers[0]; + buffer->cbBuffer = 0; + } + if(ctx->transport.in.offset && ctx->transport.in.offset != pInput->pBuffers[0].cbBuffer) { if(pInput->cBuffers<2 || pInput->pBuffers[1].BufferType!=SECBUFFER_EMPTY) return SEC_E_INVALID_TOKEN; @@ -909,13 +921,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-ctx->transport.in.offset; } - out_buffers = &ctx->transport.out; - if (out_buffers->current_buffer_idx != -1) - { - SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx]; - buffer->cbBuffer = out_buffers->offset; - } - *pfContextAttr = 0; if (ctx->req_ctx_attr & ISC_REQ_REPLAY_DETECT) *pfContextAttr |= ISC_RET_REPLAY_DETECT; diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 21ebb62..1a37c52 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -772,7 +772,6 @@ todo_wine ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); -todo_wine ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); buffers[0].pBuffers[0].cbBuffer = 0; @@ -782,9 +781,15 @@ todo_wine todo_wine ok(status == SEC_E_INSUFFICIENT_MEMORY || status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INSUFFICIENT_MEMORY or SEC_E_INVALID_TOKEN, got %08x\n", status); + ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); - buffers[0].pBuffers[0].cbBuffer = buf_size; + status = InitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, NULL, 0, &context, NULL, &attrs, NULL); +todo_wine + ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); + buffers[0].pBuffers[0].cbBuffer = buf_size; status = InitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL); @@ -859,6 +864,7 @@ todo_wine buffers[1].pBuffers[0].cbBuffer = buf_size; } + ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); ok(status == SEC_E_OK || broken(status == SEC_E_INVALID_TOKEN) /* WinNT */, "InitializeSecurityContext failed: %08x\n", status); if(status != SEC_E_OK) { -- 1.9.1

1 0

[PATCH] shell32: Choose return value for SHFileOperationA depending on windows version
by Alistair Leslie-Hughes 14 May '18

14 May '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=37916 Based off patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlfileop.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 4507b72..c7bd54d 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -882,6 +882,10 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) if (ForFree) { retCode = SHFileOperationW(&nFileOp); + /* Windows 95/98 returns S_OK for this case. */ + if (retCode == ERROR_ACCESS_DENIED && (GetVersion() & 0x80000000)) + retCode = S_OK; + heap_free(ForFree); /* we cannot use wString, it was changed */ break; } -- 1.9.1

1 0

[PATCH] po: Update Czech translation
by AsciiWolf 13 May '18

13 May '18

Hello, I have updated the Czech translation. The last time it was updated was in 2013. Feel free to merge this patch. Regards, Daniel Rusek

2 2

[PATCH v2 1/2] mp3dmod/tests: Add some tests for decoding.
by Zebediah Figura 13 May '18

13 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/mp3dmod/tests/Makefile.in | 5 + dlls/mp3dmod/tests/mp3dmod.c | 233 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 240 insertions(+) create mode 100644 dlls/mp3dmod/tests/Makefile.in create mode 100644 dlls/mp3dmod/tests/mp3dmod.c diff --git a/configure b/configure index dbe5cd5..25ccf4c 100755 --- a/configure +++ b/configure @@ -18808,6 +18808,7 @@ wine_fn_config_makefile dlls/monodebg.vxd enable_win16 wine_fn_config_makefile dlls/mountmgr.sys enable_mountmgr_sys wine_fn_config_makefile dlls/mouse.drv16 enable_win16 wine_fn_config_makefile dlls/mp3dmod enable_mp3dmod +wine_fn_config_makefile dlls/mp3dmod/tests enable_tests wine_fn_config_makefile dlls/mpr enable_mpr wine_fn_config_makefile dlls/mpr/tests enable_tests wine_fn_config_makefile dlls/mprapi enable_mprapi diff --git a/configure.ac b/configure.ac index 2c4e05a..05c1cd0 100644 --- a/configure.ac +++ b/configure.ac @@ -3402,6 +3402,7 @@ WINE_CONFIG_MAKEFILE(dlls/monodebg.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/mountmgr.sys) WINE_CONFIG_MAKEFILE(dlls/mouse.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/mp3dmod) +WINE_CONFIG_MAKEFILE(dlls/mp3dmod/tests) WINE_CONFIG_MAKEFILE(dlls/mpr) WINE_CONFIG_MAKEFILE(dlls/mpr/tests) WINE_CONFIG_MAKEFILE(dlls/mprapi) diff --git a/dlls/mp3dmod/tests/Makefile.in b/dlls/mp3dmod/tests/Makefile.in new file mode 100644 index 0000000..3cbe4fe --- /dev/null +++ b/dlls/mp3dmod/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = mp3dmod.dll +IMPORTS = dmoguids ole32 strmiids uuid wmcodecdspuuid + +C_SRCS = \ + mp3dmod.c diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c new file mode 100644 index 0000000..966c991 --- /dev/null +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -0,0 +1,233 @@ +/* + * Copyright 2018 Zebediah Figura + * + * 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 COBJMACROS +#include "windef.h" +#include "wingdi.h" +#include "mmreg.h" +#include "mmsystem.h" +#include "mediaerr.h" +#include "wmcodecdsp.h" +#include "uuids.h" +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(WMMEDIASUBTYPE_MP3, 0x00000055, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + +/* shorter aliases for flags */ +#define O_SYNCPOINT DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT +#define O_TIME DMO_OUTPUT_DATA_BUFFERF_TIME +#define O_TIMELENGTH DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH +#define O_INCOMPLETE DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE + +struct test_buffer { + IMediaBuffer IMediaBuffer_iface; + BYTE data[5000]; + DWORD len; + DWORD maxlen; +}; + +static inline struct test_buffer *impl_from_IMediaBuffer(IMediaBuffer *iface) +{ + return CONTAINING_RECORD(iface, struct test_buffer, IMediaBuffer_iface); +} + +static HRESULT WINAPI Buffer_QueryInterface(IMediaBuffer *iface, REFIID iid, void **obj) +{ + if (IsEqualIID(iid, &IID_IMediaBuffer) || IsEqualIID(iid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + ok(0, "Unexpected IID %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI Buffer_AddRef(IMediaBuffer *iface) +{ + return 2; +} + +static ULONG WINAPI Buffer_Release(IMediaBuffer *iface) +{ + return 1; +} + +static HRESULT WINAPI Buffer_SetLength(IMediaBuffer *iface, DWORD len) +{ + struct test_buffer *This = impl_from_IMediaBuffer(iface); + This->len = len; + return S_OK; +} + +static HRESULT WINAPI Buffer_GetMaxLength(IMediaBuffer *iface, DWORD *len) +{ + struct test_buffer *This = impl_from_IMediaBuffer(iface); + *len = This->maxlen; + return S_OK; +} + +static HRESULT WINAPI Buffer_GetBufferAndLength(IMediaBuffer *iface, BYTE **buf, DWORD *len) +{ + struct test_buffer *This = impl_from_IMediaBuffer(iface); + if (buf) *buf = This->data; + if (len) *len = This->len; + return S_OK; +} + +static IMediaBufferVtbl Buffer_vtbl = { + Buffer_QueryInterface, + Buffer_AddRef, + Buffer_Release, + Buffer_SetLength, + Buffer_GetMaxLength, + Buffer_GetBufferAndLength, +}; + +static void test_convert(void) +{ + static const BYTE mp3hdr[] = {0xff,0xfb,0x14,0xc4}; + struct test_buffer outbuf = {{&Buffer_vtbl}}; + struct test_buffer inbuf = {{&Buffer_vtbl}}; + DMO_MEDIA_TYPE in = {0}, out = {0}; + MPEGLAYER3WAVEFORMAT mp3fmt = {0}; + DMO_OUTPUT_DATA_BUFFER output; + WAVEFORMATEX wavfmt = {0}; + IMediaObject *dmo; + DWORD written; + DWORD status; + HRESULT hr; + int i; + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&dmo); + ok(hr == S_OK, "got %#x\n", hr); + + mp3fmt.wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + mp3fmt.wfx.nChannels = 2; + mp3fmt.wfx.nSamplesPerSec = 48000; + in.majortype = MEDIATYPE_Audio; + in.subtype = WMMEDIASUBTYPE_MP3; + in.formattype = FORMAT_WaveFormatEx; + in.cbFormat = sizeof(mp3fmt); + in.pbFormat = (BYTE *)&mp3fmt; + + hr = IMediaObject_SetInputType(dmo, 0, &in, 0); + ok(hr == S_OK, "got %#x\n", hr); + + wavfmt.wFormatTag = WAVE_FORMAT_PCM; + wavfmt.nChannels = 1; + wavfmt.nSamplesPerSec = 48000; + wavfmt.nAvgBytesPerSec = 48000 * ((1 * 8) / 8); + wavfmt.nBlockAlign = (1 * 8) / 8; + wavfmt.wBitsPerSample = 8; + out.majortype = MEDIATYPE_Audio; + out.subtype = MEDIASUBTYPE_PCM; + out.formattype = FORMAT_WaveFormatEx; + out.cbFormat = sizeof(wavfmt); + out.pbFormat = (BYTE *)&wavfmt; + + hr = IMediaObject_SetOutputType(dmo, 0, &out, 0); + ok(hr == S_OK, "got %#x\n", hr); + + outbuf.len = 0; + outbuf.maxlen = sizeof(outbuf.data); + output.pBuffer = &outbuf.IMediaBuffer_iface; + output.dwStatus = 0xdeadbeef; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(outbuf.len == 0, "got %u\n", outbuf.len); + ok(output.dwStatus == 0, "got %#x\n", output.dwStatus); + + /* write several frames of mp3 data */ + for (i = 0; i < 5; i++) + memcpy(inbuf.data + 96 * i, mp3hdr, 4); + inbuf.len = 96 * 5; + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + + outbuf.len = 0; + outbuf.maxlen = 0; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(outbuf.len == 0, "got %u\n", outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#x\n", output.dwStatus); + + /* implementations are inconsistent, but should write at least one frame of data */ + outbuf.len = 0; + outbuf.maxlen = 5000; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_OK, "got %#x\n", hr); + written = outbuf.len; + ok(written > 1152 && written <= 5000, "got %u\n", written); +todo_wine + ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH | O_INCOMPLETE), + "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(outbuf.len == written, "expected %u, got %u\n", written, outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + + /* write the rest */ + outbuf.len = 0; + outbuf.maxlen = 5000; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(written + outbuf.len == (1152 * 5) || + broken(written + outbuf.len == (1152 * 5) - 528), /* Win10 */ + "got %u, total %u\n", outbuf.len, written + outbuf.len); +todo_wine + ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH), "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(output.dwStatus == 0, "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == S_OK, "got %#x\n", hr); + + IMediaObject_Release(dmo); +} + +START_TEST(mp3dmod) +{ + IMediaObject *dmo; + HRESULT hr; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&dmo); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_CMP3DecMediaObject not available\n"); + return; + } + IMediaObject_Release(dmo); + + test_convert(); + + CoUninitialize(); +} -- 2.7.4

1 1

[PATCH website] Tighten up URL validation in news plugin
by Kyle Auble 13 May '18

13 May '18

1 0

Wine staging 3.8 release
by Alistair Leslie-Hughes 13 May '18

13 May '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.8 (920 patches are applied to wine vanilla) * Improve support for some game using the legacy nVidia driver. * Reviewed and upstreamed patches. Fixes * Star Citizen should no longer crash on startup. New Patches * d2d1: Added support for creating ID2D1Bitmap1/ID2D1Factory1/ID2D1DeviceContext interfaces. * d3d11: Stop crash when programs relied on a valid shader instances count. * d3d11: Allow Gauntlet to run using Legacy nVidia driver. * dxgi: Added support for IDXGIDevice2 interface. * wined3d: Implement oMask Support. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Oxygen not included, Gauntlet, Giana Sisters * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.com Best Regards Alistair.

1 0

[PATCH] advapi32: Correctly translate SERVICE_REQUIRED_PRIVILEGES_INFO to RPC.
by Zebediah Figura 12 May '18

12 May '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=45179. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/service.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index c78edb2..11f4da0 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2448,6 +2448,7 @@ BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel, BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, LPVOID lpInfo) { + SERVICE_RPC_REQUIRED_PRIVILEGES_INFO rpc_privinfo; DWORD err; __TRY @@ -2455,7 +2456,19 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, SC_RPC_CONFIG_INFOW info; info.dwInfoLevel = dwInfoLevel; - info.u.descr = lpInfo; + if (dwInfoLevel == SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO) + { + SERVICE_REQUIRED_PRIVILEGES_INFOW *privinfo = lpInfo; + WCHAR *p; + + for (p = privinfo->pmszRequiredPrivileges; *p; p += strlenW(p) + 1); + rpc_privinfo.cbRequiredPrivileges = + (p - privinfo->pmszRequiredPrivileges + 1) * sizeof(WCHAR); + rpc_privinfo.pRequiredPrivileges = (BYTE *)privinfo->pmszRequiredPrivileges; + info.u.privinfo = &rpc_privinfo; + } + else + info.u.descr = lpInfo; err = svcctl_ChangeServiceConfig2W( hService, info ); } __EXCEPT(rpc_filter) -- 2.7.4

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 11 May '18

11 May '18

1 0

[PATCH v2 1/6] mp3dmod: Return S_OK from SetInputType().
by Zebediah Figura 11 May '18

11 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mp3dmod/mp3dmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 0f1f069..9592280 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -127,7 +127,7 @@ static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, { FIXME("(%p)->(%d, %p, %#x) stub!\n", iface, index, type, flags); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) -- 2.7.4

2 8

[PATCH] dsound: Use correct pointer type
by Nikolay Sivov 11 May '18

11 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dsound/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 1180594526..9b3e730961 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -699,7 +699,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (!pad_frames) WARN("Probable buffer underrun\n"); - hr = IAudioRenderClient_GetBuffer(device->render, frames, (void*)&buffer); + hr = IAudioRenderClient_GetBuffer(device->render, frames, (BYTE **)&buffer); if(FAILED(hr)){ WARN("GetBuffer failed: %08x\n", hr); LeaveCriticalSection(&device->mixlock); -- 2.17.0

2 1

[PATCH] winmm: Avoid casting unsigned char to plain char.
by Akihiro Sagawa 11 May '18

11 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/winmm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] winmm: Fix default time division value in MIDI stream.
by Akihiro Sagawa 11 May '18

11 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/winmm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH 1/4] gdiplus: Fix a number of transformed points for squared caps.
by Nikolay Sivov 11 May '18

11 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index acee695e9f..6635deac56 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1594,9 +1594,9 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[3].X = x2 - dbig; ptf[2].X = x2 + dsmall; - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 4); - round_points(pt, ptf, 3); + round_points(pt, ptf, 4); Polygon(graphics->hdc, pt, 4); -- 2.17.0

2 7

[PATCH 9/9] jscript: Added Object.defineProperties stub.
by Jacek Caban 11 May '18

11 May '18

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

2 1

[PATCH 8/9] jscript: Use jsdisp_define_property to set prototype constructors.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 5 ----- dlls/jscript/function.c | 3 ++- dlls/jscript/jscript.h | 1 - dlls/mshtml/tests/es5.js | 1 + 4 files changed, 3 insertions(+), 7 deletions(-)

2 1

[PATCH 7/9] jscript: Use jsdisp_define_property to set function prototypes.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 12 ++++-------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 8 insertions(+), 8 deletions(-)

2 1

[PATCH 5/9] jscript: Use jsdisp_define_property for Error object properties.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/error.c | 13 +++++++++---- dlls/mshtml/tests/es5.js | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-)

2 2

[PATCH 1/6] mp3dmod: Return S_OK from SetInputType().
by Zebediah Figura 11 May '18

11 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mp3dmod/mp3dmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 0f1f069..9592280 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -127,7 +127,7 @@ static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, { FIXME("(%p)->(%d, %p, %#x) stub!\n", iface, index, type, flags); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) -- 2.7.4

3 9

[PATCH 6/9] jscript: Use jsdisp_define_data_property for arguments object properties.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 6 ++++-- dlls/mshtml/tests/es5.js | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-)

2 1

[PATCH 4/9] jscript: Use jsdisp_define_property instead of jsdisp_propput_dontenum for global properties.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/global.c | 58 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 20 deletions(-)

1 0

[PATCH 3/9] jscript: Make global constants non-writable in ES5 mode.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/global.c | 7 ++++--- dlls/mshtml/tests/es5.js | 20 +++++++++++++++++++- 2 files changed, 23 insertions(+), 4 deletions(-)

1 0

[PATCH 2/9] jscript: Use jsdisp_define_property instead of jsdisp_propput_const.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 6 ++++++ dlls/jscript/function.c | 3 ++- dlls/jscript/jscript.h | 2 +- dlls/jscript/math.c | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-)

1 0

[PATCH 1/9] jscript: Add Object.defineProperty implementation.
by Jacek Caban 11 May '18

11 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 81 +++++++++++++++ dlls/jscript/jscript.h | 11 +++ dlls/jscript/jscript.rc | 4 + dlls/jscript/object.c | 200 +++++++++++++++++++++++++++++++++++++- dlls/jscript/resource.h | 6 ++ dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/es5.js | 99 ++++++++++++++++++- dlls/mshtml/tests/winetest.js | 4 + 8 files changed, 400 insertions(+), 6 deletions(-)

1 0

[PATCH] atmlib: add stub for ATMFinish
by Louis Lenders 11 May '18

11 May '18

This fixes a regression in https://bugs.winehq.org/show_bug.cgi?id=45158 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/atmlib/atmlib.spec | 2 +- dlls/atmlib/main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/atmlib/atmlib.spec b/dlls/atmlib/atmlib.spec index 387486dd4d..dc55548b1f 100644 --- a/dlls/atmlib/atmlib.spec +++ b/dlls/atmlib/atmlib.spec @@ -16,7 +16,7 @@ @ stub ATMEnumMMFonts @ stub ATMEnumMMFontsA @ stub ATMEnumMMFontsW -@ stub ATMFinish +@ stdcall ATMFinish() @ stub ATMFontAvailable @ stub ATMFontAvailableA @ stub ATMFontAvailableW diff --git a/dlls/atmlib/main.c b/dlls/atmlib/main.c index 0baca0001e..efae51f409 100644 --- a/dlls/atmlib/main.c +++ b/dlls/atmlib/main.c @@ -45,3 +45,9 @@ BOOL WINAPI ATMProperlyLoaded(void) FIXME("stub\n"); return FALSE; } + +int WINAPI ATMFinish(void) +{ + FIXME("stub\n"); + return 0; +} -- 2.17.0

1 0

[PATCH 2/2] mstask: Export the AT Service RPC API. (resend)
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/Makefile.in | 3 ++- dlls/mstask/atsvc.idl | 21 +++++++++++++++++++++ dlls/mstask/mstask.spec | 16 ++++++++-------- dlls/mstask/mstask_main.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 dlls/mstask/atsvc.idl diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index d914666eed..086d3c0c5a 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -1,5 +1,5 @@ MODULE = mstask.dll -IMPORTS = ole32 oleaut32 +IMPORTS = rpcrt4 ole32 oleaut32 C_SRCS = \ factory.c \ @@ -9,4 +9,5 @@ C_SRCS = \ task_trigger.c IDL_SRCS = \ + atsvc.idl \ mstask_local.idl diff --git a/dlls/mstask/atsvc.idl b/dlls/mstask/atsvc.idl new file mode 100644 index 0000000000..b5a2cee0e9 --- /dev/null +++ b/dlls/mstask/atsvc.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2018 Dmitry Timoshkov + * + * 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 + */ + +#pragma makedep client + +#include "wine/atsvc.idl" diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec index 0b6c23b79d..dcfb20cab3 100644 --- a/dlls/mstask/mstask.spec +++ b/dlls/mstask/mstask.spec @@ -2,10 +2,10 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub GetNetScheduleAccountInformation -@ stub NetrJobAdd -@ stub NetrJobDel -@ stub NetrJobEnum -@ stub NetrJobGetInfo +@ stdcall NetrJobAdd(wstr ptr ptr) +@ stdcall NetrJobDel(wstr long long) +@ stdcall NetrJobEnum(wstr ptr long ptr ptr) +@ stdcall NetrJobGetInfo(wstr long ptr) @ stub SAGetAccountInformation @ stub SAGetNSAccountInformation @ stub SASetAccountInformation @@ -15,10 +15,10 @@ @ stub _DllCanUnloadNow@0 @ stub _DllGetClassObject@12 @ stub _GetNetScheduleAccountInformation@12 -@ stub _NetrJobAdd@12 -@ stub _NetrJobDel@12 -@ stub _NetrJobEnum@20 -@ stub _NetrJobGetInfo@12 +@ stdcall _NetrJobAdd@12(wstr ptr ptr) NetrJobAdd +@ stdcall _NetrJobDel@12(wstr long long) NetrJobDel +@ stdcall _NetrJobEnum@20(wstr ptr long ptr ptr) NetrJobEnum +@ stdcall _NetrJobGetInfo@12(wstr long ptr) NetrJobGetInfo @ stub _SAGetAccountInformation@16 @ stub _SAGetNSAccountInformation@12 @ stub _SASetAccountInformation@20 diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index eae85562f5..c1e9036819 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -27,6 +27,7 @@ #include "taskschd.h" #include "mstask.h" #include "mstask_private.h" +#include "atsvc.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mstask); @@ -77,3 +78,32 @@ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( hInst ); } + +DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) +{ + return HeapAlloc(GetProcessHeap(), 0, n); +} + +DECLSPEC_HIDDEN void __RPC_USER MIDL_user_free(void __RPC_FAR *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} + +DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) +{ + static unsigned char ncalrpc[] = "ncalrpc"; + unsigned char *binding_str; + handle_t rpc_handle = 0; + + if (RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str) == RPC_S_OK) + { + RpcBindingFromStringBindingA(binding_str, &rpc_handle); + RpcStringFreeA(&binding_str); + } + return rpc_handle; +} + +DECLSPEC_HIDDEN void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle) +{ + RpcBindingFree(&rpc_handle); +} -- 2.16.3

2 2

[PATCH] mstask: Add stdcall to cdecl thunks for AT Service RPC API.
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/mstask.spec | 16 ++++++++-------- dlls/mstask/mstask_main.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec index dcfb20cab3..df8ea7ad78 100644 --- a/dlls/mstask/mstask.spec +++ b/dlls/mstask/mstask.spec @@ -2,10 +2,10 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub GetNetScheduleAccountInformation -@ stdcall NetrJobAdd(wstr ptr ptr) -@ stdcall NetrJobDel(wstr long long) -@ stdcall NetrJobEnum(wstr ptr long ptr ptr) -@ stdcall NetrJobGetInfo(wstr long ptr) +@ stdcall NetrJobAdd(wstr ptr ptr) NetrJobAdd_wrapper +@ stdcall NetrJobDel(wstr long long) NetrJobDel_wrapper +@ stdcall NetrJobEnum(wstr ptr long ptr ptr) NetrJobEnum_wrapper +@ stdcall NetrJobGetInfo(wstr long ptr) NetrJobGetInfo_wrapper @ stub SAGetAccountInformation @ stub SAGetNSAccountInformation @ stub SASetAccountInformation @@ -15,10 +15,10 @@ @ stub _DllCanUnloadNow@0 @ stub _DllGetClassObject@12 @ stub _GetNetScheduleAccountInformation@12 -@ stdcall _NetrJobAdd@12(wstr ptr ptr) NetrJobAdd -@ stdcall _NetrJobDel@12(wstr long long) NetrJobDel -@ stdcall _NetrJobEnum@20(wstr ptr long ptr ptr) NetrJobEnum -@ stdcall _NetrJobGetInfo@12(wstr long ptr) NetrJobGetInfo +@ stdcall _NetrJobAdd@12(wstr ptr ptr) NetrJobAdd_wrapper +@ stdcall _NetrJobDel@12(wstr long long) NetrJobDel_wrapper +@ stdcall _NetrJobEnum@20(wstr ptr long ptr ptr) NetrJobEnum_wrapper +@ stdcall _NetrJobGetInfo@12(wstr long ptr) NetrJobGetInfo_wrapper @ stub _SAGetAccountInformation@16 @ stub _SAGetNSAccountInformation@12 @ stub _SASetAccountInformation@20 diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index c1e9036819..e747af69e8 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -79,6 +79,27 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( hInst ); } +DWORD WINAPI NetrJobAdd_wrapper(ATSVC_HANDLE server_name, LPAT_INFO info, LPDWORD jobid) +{ + return NetrJobAdd(server_name, info, jobid); +} + +DWORD WINAPI NetrJobDel_wrapper(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid) +{ + return NetrJobDel(server_name, min_jobid, max_jobid); +} + +DWORD WINAPI NetrJobEnum_wrapper(ATSVC_HANDLE server_name, LPAT_ENUM_CONTAINER container, + DWORD max_length, LPDWORD total, LPDWORD resume) +{ + return NetrJobEnum(server_name, container, max_length, total, resume); +} + +DWORD WINAPI NetrJobGetInfo_wrapper(ATSVC_HANDLE server_name, DWORD jobid, LPAT_INFO *info) +{ + return NetrJobGetInfo(server_name, jobid, info); +} + DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) { return HeapAlloc(GetProcessHeap(), 0, n); -- 2.16.3

1 0

[PATCH 1/2] ntdll: Implement NtCreateToken.
by Hans Leidekker 11 May '18

11 May '18

v2: Validate request data. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- server/protocol.def | 15 ++++++ server/token.c | 119 +++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 258 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c3f5df337f..29fff96036 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -70,6 +70,135 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); * Token */ +static BOOL get_primary_group_index( const TOKEN_PRIMARY_GROUP *primary, const TOKEN_GROUPS *groups, + unsigned int *index ) +{ + unsigned int i; + for (i = 0; i < groups->GroupCount; i++) + { + if (RtlEqualSid( primary->PrimaryGroup, groups->Groups[i].Sid )) + { + *index = i + 1; /* 0 is reserved for user */ + return TRUE; + } + } + return FALSE; +} + +static BOOL get_owner_index( const TOKEN_OWNER *owner, const TOKEN_USER *user, const TOKEN_GROUPS *groups, + unsigned int *index ) +{ + unsigned int i; + if (RtlEqualSid( owner->Owner, user->User.Sid )) + { + *index = 0; + return TRUE; + } + for (i = 0; i < groups->GroupCount; i++) + { + if (RtlEqualSid( owner->Owner, groups->Groups[i].Sid )) + { + *index = i + 1; + return TRUE; + } + } + return FALSE; +} + +/* create flat groups buffer and store user as first entry */ +static struct token_groups *flatten_groups( const TOKEN_USER *user, const TOKEN_GROUPS *groups, data_size_t *size ) +{ + struct token_groups *ret; + unsigned int i, sid_len, *attr; + char *sid; + + *size = sizeof(*ret) + sizeof(*attr) + RtlLengthSid( user->User.Sid ); + for (i = 0; i < groups->GroupCount; i++) + { + *size += sizeof(*attr); + *size += RtlLengthSid( groups->Groups[i].Sid ); + } + + if (!(ret = RtlAllocateHeap( GetProcessHeap(), 0, *size ))) return NULL; + attr = (unsigned int *)(ret + 1); + sid = (char *)attr + (groups->GroupCount + 1) * sizeof(*attr); + + *attr++ = user->User.Attributes; + sid_len = RtlLengthSid( user->User.Sid ); + memcpy( sid, user->User.Sid, sid_len ); + sid += sid_len; + + for (i = 0; i < groups->GroupCount; i++) + { + *attr++ = groups->Groups[i].Attributes; + sid_len = RtlLengthSid( groups->Groups[i].Sid ); + memcpy( sid, groups->Groups[i].Sid, sid_len ); + sid += sid_len; + } + + ret->count = groups->GroupCount + 1; + return ret; +} + +static unsigned int acl_size( const ACL *acl ) +{ + unsigned int i, ret = sizeof(*acl); + ACE_HEADER *ace = (ACE_HEADER *)(acl + 1); + if (!acl) return 0; + for (i = 0; i < acl->AceCount; i++) ret += ace[i].AceSize; + return ret; +} + +NTSTATUS WINAPI NtCreateToken( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attrs, TOKEN_TYPE type, + LUID *session, LARGE_INTEGER *expiration, TOKEN_USER *user, TOKEN_GROUPS *groups, + TOKEN_PRIVILEGES *privs, TOKEN_OWNER *owner, TOKEN_PRIMARY_GROUP *primary_group, + TOKEN_DEFAULT_DACL *dacl, TOKEN_SOURCE *source ) +{ + NTSTATUS status; + struct object_attributes *objattr; + struct token_groups *flat_groups; + data_size_t attr_size, flat_groups_size, default_dacl_size = dacl ? acl_size( dacl->DefaultDacl ) : 0; + ACL *default_dacl = dacl ? dacl->DefaultDacl : NULL; + unsigned int primary_group_index, owner_index; + + TRACE( "(%p,%08x,%s,%u,%p,%p,%p,%p,%p,%p,%p,%p,%p)\n", handle, access, debugstr_ObjectAttributes(attrs), + type, session, expiration, user, groups, privs, owner, primary_group, dacl, source ); + + if (!handle || !session || !expiration || !user || !groups || !privs || !owner || !primary_group || !source) + return STATUS_ACCESS_VIOLATION; + + if (!get_primary_group_index( primary_group, groups, &primary_group_index )) return STATUS_INVALID_PRIMARY_GROUP; + if (!get_owner_index( owner, user, groups, &owner_index )) return STATUS_INVALID_OWNER; + + if (!(flat_groups = flatten_groups( user, groups, &flat_groups_size ))) return STATUS_NO_MEMORY; + if ((status = alloc_object_attributes( attrs, &objattr, &attr_size ))) + { + RtlFreeHeap( GetProcessHeap(), 0, flat_groups ); + return status; + } + + SERVER_START_REQ( create_token ) + { + req->access = access; + req->primary = (type == TokenPrimary); + req->primary_group_index = primary_group_index; + req->owner_index = owner_index; + req->privilege_count = privs->PrivilegeCount; + req->default_dacl_size = default_dacl_size; + wine_server_add_data( req, objattr, attr_size ); + wine_server_add_data( req, privs->Privileges, privs->PrivilegeCount * sizeof(privs->Privileges[0]) ); + wine_server_add_data( req, default_dacl, default_dacl_size ); + wine_server_add_data( req, flat_groups, flat_groups_size ); + status = wine_server_call( req ); + if (!status) *handle = wine_server_ptr_handle( reply->token ); + } + SERVER_END_REQ; + + RtlFreeHeap( GetProcessHeap(), 0, flat_groups ); + RtlFreeHeap( GetProcessHeap(), 0, objattr ); + return status; +} + /****************************************************************************** * NtDuplicateToken [NTDLL.@] * ZwDuplicateToken [NTDLL.@] diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c260b0dbec..27e51a165b 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -154,7 +154,7 @@ @ stub NtCreateThread @ stdcall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall NtCreateTimer(ptr long ptr long) -@ stub NtCreateToken +@ stdcall NtCreateToken(ptr long ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr ) # @ stub NtCreateWaitablePort @ stdcall -arch=win32,arm64 NtCurrentTeb() # @ stub NtDebugActiveProcess diff --git a/server/protocol.def b/server/protocol.def index 35824ae952..3dae8ab521 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3286,6 +3286,21 @@ enum caret_state user_handle_t window; /* clipboard listener window */ @END +/* Create a security token */ +@REQ(create_token) + unsigned int access; /* access rights to the new token */ + int primary; /* is the new token to be a primary one? */ + unsigned int primary_group_index; /* primary group index into groups array */ + unsigned int owner_index; /* owner index into groups array */ + unsigned int privilege_count; /* number of privileges */ + unsigned int default_dacl_size; /* size of default dacl */ + VARARG(objattr,object_attributes); /* object attributes */ + VARARG(default_dacl,ACL); /* token default dacl */ + VARARG(privileges,LUID_AND_ATTRIBUTES); /* token privileges */ + VARARG(groups,token_groups); /* token groups, first element is token user */ +@REPLY + obj_handle_t token; /* handle to the token */ +@END /* Open a security token */ @REQ(open_token) diff --git a/server/token.c b/server/token.c index 0810a61353..172a3414ab 100644 --- a/server/token.c +++ b/server/token.c @@ -221,6 +221,11 @@ const SID *security_unix_uid_to_sid( uid_t uid ) return &anonymous_logon_sid; } +static inline int sid_is_valid( const SID *sid, data_size_t size ) +{ + return (size >= FIELD_OFFSET( SID, SubAuthority[0] ) && size >= security_sid_len( sid )); +} + static int acl_is_valid( const ACL *acl, data_size_t size ) { ULONG i; @@ -269,8 +274,7 @@ static int acl_is_valid( const ACL *acl, data_size_t size ) default: return FALSE; } - if (sid_size < FIELD_OFFSET(SID, SubAuthority[0]) || sid_size < security_sid_len( sid )) - return FALSE; + if (!sid_is_valid( sid, sid_size )) return FALSE; ace = ace_next( ace ); } return TRUE; @@ -326,7 +330,6 @@ int sd_is_valid( const struct security_descriptor *sd, data_size_t size ) dacl = sd_get_dacl( sd, &dummy ); if (dacl && !acl_is_valid( dacl, sd->dacl_len )) return FALSE; - offset += sd->dacl_len; return TRUE; } @@ -527,7 +530,7 @@ static void token_destroy( struct object *obj ) * modified_id may be NULL, indicating that a new modified_id luid should be * allocated. */ -static struct token *create_token( unsigned primary, const SID *user, +static struct token *token_create( unsigned primary, const SID *user, const SID_AND_ATTRIBUTES *groups, unsigned int group_count, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, const ACL *default_dacl, TOKEN_SOURCE source, @@ -638,7 +641,7 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, return NULL; } - token = create_token( primary, src_token->user, NULL, 0, + token = token_create( primary, src_token->user, NULL, 0, NULL, 0, src_token->default_dacl, src_token->source, modified_id, impersonation_level ); @@ -836,7 +839,7 @@ struct token *token_create_admin( void ) { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID }, }; static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; - token = create_token( TRUE, user_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), + token = token_create( TRUE, user_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), default_dacl, admin_source, NULL, -1 ); /* we really need a primary group */ @@ -1173,6 +1176,110 @@ int check_object_access(struct object *obj, unsigned int *access) return res; } +/* create a security token */ +DECL_HANDLER(create_token) +{ + static const TOKEN_SOURCE source = {"SeMgr", {0, 0}}; + struct token *token; + struct unicode_str name; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, NULL ); + data_size_t data_size, privs_size; + const LUID_AND_ATTRIBUTES *privs; + const ACL *acl = NULL; + ACL *default_dacl = NULL; + const struct token_groups *groups; + const unsigned int *attr; + unsigned int i; + const SID *sid; + + if (!objattr) return; + + privs = get_req_data_after_objattr( objattr, &data_size ); + privs_size = req->privilege_count * sizeof(*privs); + if (privs_size > data_size) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + data_size -= privs_size; + + if (req->default_dacl_size) + { + acl = (const ACL *)((const char *)privs + privs_size); + if (!acl_is_valid( acl, req->default_dacl_size )) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + } + data_size -= req->default_dacl_size; + + groups = (const struct token_groups *)((const char *)privs + privs_size + req->default_dacl_size); + if (data_size < sizeof(*groups) || !groups->count || + sizeof(*groups) + groups->count * sizeof(*attr) > data_size || + req->primary_group_index < 1 || req->primary_group_index >= groups->count || + req->owner_index >= groups->count) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + attr = (const unsigned int *)(groups + 1); + data_size -= sizeof(*groups) + groups->count * sizeof(*attr); + + sid = (const SID *)(attr + groups->count); + for (i = 0; i < groups->count; i++) + { + if (!sid_is_valid( sid, data_size )) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + data_size -= security_sid_len( sid ); + sid = (const SID *)((const char *)sid + security_sid_len( sid )); + } + + if (!acl) acl = default_dacl = create_default_dacl( sid ); + sid = (const SID *)(attr + groups->count); /* first entry is user */ + + if ((token = token_create( req->primary, sid, NULL, 0, privs, req->privilege_count, acl, source, NULL, + SecurityIdentification ))) + { + sid = (const SID *)((const char *)sid + security_sid_len( sid )); /* skip user */ + attr++; + for (i = 1; i < groups->count; i++) + { + struct group *group; + if (!(group = mem_alloc( FIELD_OFFSET(struct group, sid.SubAuthority[sid->SubAuthorityCount]) ))) + { + release_object( token ); + return; + } + + memcpy( &group->sid, sid, security_sid_len( sid ) ); + group->enabled = (*attr & SE_GROUP_ENABLED) != 0; + group->def = (*attr & SE_GROUP_ENABLED_BY_DEFAULT) != 0; + group->logon = (*attr & SE_GROUP_LOGON_ID) != 0; + group->mandatory = (*attr & SE_GROUP_MANDATORY) != 0; + group->owner = (*attr & SE_GROUP_OWNER) != 0; + group->resource = (*attr & SE_GROUP_RESOURCE) != 0; + group->deny_only = (*attr & SE_GROUP_USE_FOR_DENY_ONLY) != 0; + list_add_tail( &token->groups, &group->entry ); + + if (req->primary_group_index == i) token->primary_group = &group->sid; + if (req->owner_index == i) token->owner = &group->sid; + + sid = (const SID *)((const char *)sid + security_sid_len( sid )); + attr++; + } + if (!req->owner_index) token->owner = token->user; + + reply->token = alloc_handle( current->process, token, req->access, objattr->attributes ); + release_object( token ); + } + + free( default_dacl ); +} /* open a security token */ DECL_HANDLER(open_token) -- 2.11.0

2 1

[PATCH] shell32: Choose return value for SHFileOperationW depending on windows version
by Alistair Leslie-Hughes 11 May '18

11 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlfileop.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 4507b72..244b34b 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1019,7 +1019,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) /* empty list */ if (!szFiles[0]) - return ERROR_ACCESS_DENIED; + return ERROR_ACCESS_DENIED; /* S_OK for Windows 95/98 */ flList->feFiles = heap_alloc_zero(flList->num_alloc * sizeof(FILE_ENTRY)); @@ -1525,7 +1525,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) ZeroMemory(&flTo, sizeof(FILE_LIST)); if ((ret = parse_file_list(&flFrom, lpFileOp->pFrom))) + { + if (ret != ERROR_ACCESS_DENIED) + return ret; + + /* Windows 95/98 */ + if (GetVersion() & 0x80000000) + return S_OK; + + WARN("The return value of this function call depends on the windows version.\n"); + WARN("For older software it might be necessary to set the windows version to 95/98 using winecfg.\n"); + return ret; + } if (lpFileOp->wFunc != FO_DELETE) parse_file_list(&flTo, lpFileOp->pTo); -- 1.9.1

2 1

[PATCH 11/12] mstask/tests: Add some tests for ITask::Run().
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 6837782f2a..2e8ee93630 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -591,6 +591,169 @@ static void test_task_state(void) cleanup_task(); } +static void save_job(ITask *task) +{ + HRESULT hr; + IPersistFile *pfile; + + hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistFile_Save(pfile, NULL, FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + IPersistFile_Release(pfile); +} + +static void test_Run(void) +{ + static const WCHAR wine_test_runW[] = { 'w','i','n','e','_','t','e','s','t','_','r','u','n',0 }; + static const WCHAR cmdW[] = { 'c','m','d','.','e','x','e',0 }; + ITaskScheduler *scheduler; + ITask *task; + ITaskTrigger *trigger; + WORD idx, i; + TASK_TRIGGER trigger_data; + SYSTEMTIME st; + HRESULT hr, status; + + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **)&scheduler); + ok(hr == S_OK, "got %#x\n", hr); + + /* cleanup after previous runs */ + ITaskScheduler_Delete(scheduler, wine_test_runW); + + hr = ITaskScheduler_NewWorkItem(scheduler, wine_test_runW, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_Run(task); + ok(hr == SCHED_E_TASK_NOT_READY, "got %#x\n", hr); + + hr = ITask_Terminate(task); + ok(hr == SCHED_E_TASK_NOT_RUNNING, "got %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + + save_job(task); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + + hr = ITask_CreateTrigger(task, &idx, &trigger); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&trigger_data, 0, sizeof(trigger_data)); + trigger_data.cbTriggerSize = sizeof(trigger_data); + trigger_data.Reserved1 = 0; + GetLocalTime(&st); + trigger_data.wBeginYear = st.wYear; + trigger_data.wBeginMonth = st.wMonth; + trigger_data.wBeginDay = st.wDay; + trigger_data.wStartHour = st.wHour; + trigger_data.wStartMinute = st.wMinute; + trigger_data.TriggerType = TASK_TIME_TRIGGER_WEEKLY; + trigger_data.Type.Weekly.WeeksInterval = 1; + trigger_data.Type.Weekly.rgfDaysOfTheWeek = 0x7f; /* every day */ + hr = ITaskTrigger_SetTrigger(trigger, &trigger_data); + ok(hr == S_OK, "got %#x\n", hr); + ITaskTrigger_Release(trigger); + + hr = ITask_SetApplicationName(task, cmdW); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_SetParameters(task, empty); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_SetWorkingDirectory(task, empty); + ok(hr == S_OK, "got %#x\n", hr); + + /* Save the task so that the Scheduler service would notice the changes */ + save_job(task); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", status); + + hr = ITask_Run(task); + ok(hr == S_OK, "got %#x\n", hr); + + /* According to MSDN the task status doesn't update dynamically */ + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", status); + + ITask_Release(task); + + /* Running the process associated with the task to start up may + * take quite a bit a of time, and waiting for it during the test + * may be not the best idea. + * + * This is how it's supposed to look like in the application + * (the loop should be infinite): + */ + for (i = 0; i < 3; i++) + { + hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "Activate error %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); + + if (status == SCHED_S_TASK_RUNNING) break; + + Sleep(100); + } + + hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "Activate error %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + + if (status == SCHED_S_TASK_RUNNING) + { + hr = ITask_Terminate(task); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); + + /* Waiting for the process associated with the task to terminate + * may take quite a bit a of time, and waiting for it during the + * test is not practical. + * + * This is how it's supposed to look like in the application + * (the loop should be infinite): + */ + for (i = 0; i < 3; i++) + { + hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "Activate error %#x\n", hr); + + hr = ITask_GetStatus(task, &status); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); + + if (status != SCHED_S_TASK_RUNNING) break; + + Sleep(100); + } + } + else + ITask_Release(task); + + hr = ITaskScheduler_Delete(scheduler, wine_test_runW); + ok(hr == S_OK, "got %#x\n", hr); + ITaskScheduler_Release(scheduler); +} + START_TEST(task) { CoInitialize(NULL); @@ -601,5 +764,6 @@ START_TEST(task) test_SetMaxRunTime_GetMaxRunTime(); test_SetAccountInformation_GetAccountInformation(); test_task_state(); + test_Run(); CoUninitialize(); } -- 2.16.3

2 3

[PATCH] server: Map EXDEV to STATUS_NOT_SAME_DEVICE.
by Alistair Leslie-Hughes 11 May '18

11 May '18

From: Qian Hong <qhong(a)codeweavers.com> SMB Reference document (look for STATUS_NOT_SAME_DEVICE). https://msdn.microsoft.com/en-us/library/ee441884.aspx Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- server/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/file.c b/server/file.c index 390b072..446621a 100644 --- a/server/file.c +++ b/server/file.c @@ -671,6 +671,7 @@ void file_set_error(void) case EFBIG: set_error( STATUS_SECTION_TOO_BIG ); break; case ENODEV: set_error( STATUS_NO_SUCH_DEVICE ); break; case ENXIO: set_error( STATUS_NO_SUCH_DEVICE ); break; + case EXDEV: set_error( STATUS_NOT_SAME_DEVICE ); break; #ifdef EOVERFLOW case EOVERFLOW: set_error( STATUS_INVALID_PARAMETER ); break; #endif -- 1.9.1

1 0

[PATCH 12/12] schedsvc: Read more task fields from the job file.
by Dmitry Timoshkov 11 May '18

11 May '18

Print a FIXME() when the service detects a client action. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index cb9bc1fe98..542dfc3701 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -60,6 +60,8 @@ struct job_t struct list entry; WCHAR *name; AT_ENUM info; + FIXDLEN_DATA data; + USHORT instance_count; }; static LONG current_jobid = 1; @@ -109,13 +111,12 @@ static DWORD load_unicode_strings(const char *data, DWORD limit, AT_ENUM *info) return data_size; } -/* FIXME: read more data, currently only Command is handled */ -static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) +static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) { const FIXDLEN_DATA *fixed; const SYSTEMTIME *st; DWORD unicode_strings_size, data_size, triggers_size; - USHORT instance_count, triggers_count, i; + USHORT triggers_count, i; const USHORT *signature; const TASK_TRIGGER *trigger; @@ -128,6 +129,7 @@ static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) } fixed = (const FIXDLEN_DATA *)data; + info->data = *fixed; TRACE("product_version %04x\n", fixed->product_version); TRACE("file_version %04x\n", fixed->file_version); @@ -156,11 +158,11 @@ static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) return FALSE; } - instance_count = *(const USHORT *)(data + sizeof(*fixed)); - TRACE("instance count %u\n", instance_count); + info->instance_count = *(const USHORT *)(data + sizeof(*fixed)); + TRACE("instance count %u\n", info->instance_count); if (fixed->name_size_offset + sizeof(USHORT) < size) - unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, info); + unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, &info->info); else { TRACE("invalid name_size_offset\n"); @@ -269,7 +271,7 @@ static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) return TRUE; } -static BOOL load_job(const WCHAR *name, AT_ENUM *info) +static BOOL load_job(const WCHAR *name, struct job_t *info) { HANDLE file, mapping; DWORD size, try; @@ -332,12 +334,17 @@ void add_job(const WCHAR *name) job = heap_alloc_zero(sizeof(*job)); if (!job) return; - if (!load_job(name, &job->info)) + if (!load_job(name, job)) { free_job(job); return; } + if (job->data.flags & 0x08000000) + FIXME("Terminate(%s): not implemented\n", debugstr_w(job->info.Command)); + else if (job->data.flags & 0x04000000) + FIXME("Run(%s): not implemented\n", debugstr_w(job->info.Command)); + EnterCriticalSection(&at_job_list_section); job->name = heap_strdupW(name); job->info.JobId = current_jobid++; -- 2.16.3

1 0

[PATCH 10/12] mstask: Implement ITask::Terminate().
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index fa84f4e9ed..9cdf92e319 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -283,11 +283,17 @@ static HRESULT WINAPI MSTASK_ITask_Run(ITask *iface) return IPersistFile_Save(&This->IPersistFile_iface, NULL, FALSE); } -static HRESULT WINAPI MSTASK_ITask_Terminate( - ITask* iface) +static HRESULT WINAPI MSTASK_ITask_Terminate(ITask *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p)\n", iface); + + if (!This->instance_count) + return SCHED_E_TASK_NOT_RUNNING; + + This->flags |= 0x08000000; + return IPersistFile_Save(&This->IPersistFile_iface, NULL, FALSE); } static HRESULT WINAPI MSTASK_ITask_EditWorkItem( -- 2.16.3

1 0

[PATCH 09/12] mstask: Implement ITask::Run().
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 82ba96edf8..fa84f4e9ed 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -270,11 +270,17 @@ static HRESULT WINAPI MSTASK_ITask_GetIdleWait(ITask *iface, WORD *idle_minutes, return S_OK; } -static HRESULT WINAPI MSTASK_ITask_Run( - ITask* iface) +static HRESULT WINAPI MSTASK_ITask_Run(ITask *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p)\n", iface); + + if (This->status == SCHED_S_TASK_NOT_SCHEDULED) + return SCHED_E_TASK_NOT_READY; + + This->flags |= 0x04000000; + return IPersistFile_Save(&This->IPersistFile_iface, NULL, FALSE); } static HRESULT WINAPI MSTASK_ITask_Terminate( -- 2.16.3

1 0

[PATCH 08/12] mstask: Try opening a file more times when saving a job file.
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index a5dd603ff4..82ba96edf8 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1195,7 +1195,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta FIXDLEN_DATA fixed; WORD word, user_data_size = 0; HANDLE hfile; - DWORD size, ver, disposition; + DWORD size, ver, disposition, try; TaskImpl *This = impl_from_IPersistFile(iface); ITask *task = &This->ITask_iface; LPWSTR appname = NULL, params = NULL, workdir = NULL, creator = NULL, comment = NULL; @@ -1258,9 +1258,15 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta fixed.flags = This->flags; memset(&fixed.last_runtime, 0, sizeof(fixed.last_runtime)); - hfile = CreateFileW(task_name, GENERIC_WRITE, 0, NULL, disposition, 0, 0); - if (hfile == INVALID_HANDLE_VALUE) - return HRESULT_FROM_WIN32(GetLastError()); + try = 1; + for (;;) + { + hfile = CreateFileW(task_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, disposition, 0, 0); + if (hfile != INVALID_HANDLE_VALUE) break; + + if (try++ >= 3) return HRESULT_FROM_WIN32(GetLastError()); + Sleep(100); + } if (!WriteFile(hfile, &fixed, sizeof(fixed), &size, NULL)) { -- 2.16.3

1 0

[PATCH 07/12] mstask: Write more correct flags and status to the job file.
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index aa50620e53..a5dd603ff4 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1252,8 +1252,10 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta fixed.priority = This->priority; fixed.maximum_runtime = This->maxRunTime; fixed.exit_code = 0; - fixed.status = SCHED_S_TASK_HAS_NOT_RUN; - fixed.flags = 0; + if (This->status == SCHED_S_TASK_NOT_SCHEDULED && This->trigger_count) + This->status = SCHED_S_TASK_HAS_NOT_RUN; + fixed.status = This->status; + fixed.flags = This->flags; memset(&fixed.last_runtime, 0, sizeof(fixed.last_runtime)); hfile = CreateFileW(task_name, GENERIC_WRITE, 0, NULL, disposition, 0, 0); -- 2.16.3

1 0

[PATCH 06/12] mstask: Return SCHED_S_TASK_RUNNING from ITask::GetStatus() if there are running task instances.
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 47ed4cb51d..aa50620e53 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -307,7 +307,7 @@ static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) TRACE("(%p, %p)\n", iface, status); - *status = This->status; + *status = This->instance_count ? SCHED_S_TASK_RUNNING : This->status; return S_OK; } -- 2.16.3

1 0

[PATCH 05/12] mstask: Implement ITask::GetFlags().
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index c99d51fd9d..47ed4cb51d 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -489,8 +489,10 @@ static HRESULT WINAPI MSTASK_ITask_SetFlags( static HRESULT WINAPI MSTASK_ITask_GetFlags(ITask *iface, DWORD *flags) { - FIXME("(%p, %p): stub\n", iface, flags); - *flags = 0; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p)\n", iface, flags); + *flags = LOWORD(This->flags); return S_OK; } -- 2.16.3

1 0

[PATCH 04/12] mstask: Initialize more task fields from the job file on load.
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 5ec7064560..c99d51fd9d 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -58,6 +58,7 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; + UINT flags; HRESULT status; WORD idle_minutes, deadline_minutes; DWORD priority, maxRunTime; @@ -65,6 +66,7 @@ typedef struct DWORD trigger_count; TASK_TRIGGER *trigger; BOOL is_dirty; + USHORT instance_count; } TaskImpl; static inline TaskImpl *impl_from_ITask(ITask *iface) @@ -855,7 +857,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) const FIXDLEN_DATA *fixed; const SYSTEMTIME *st; DWORD unicode_strings_size, data_size, triggers_size; - USHORT instance_count, trigger_count, i; + USHORT trigger_count, i; const USHORT *signature; TASK_TRIGGER *task_trigger; @@ -888,7 +890,9 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) This->maxRunTime = fixed->maximum_runtime; TRACE("exit_code %#x\n", fixed->exit_code); TRACE("status %08x\n", fixed->status); + This->status = fixed->status; TRACE("flags %08x\n", fixed->flags); + This->flags = fixed->flags; st = &fixed->last_runtime; TRACE("last_runtime %d/%d/%d wday %d %d:%d:%d.%03d\n", st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, @@ -901,8 +905,8 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) return SCHED_E_INVALID_TASK; } - instance_count = *(const USHORT *)(data + sizeof(*fixed)); - TRACE("instance count %u\n", instance_count); + This->instance_count = *(const USHORT *)(data + sizeof(*fixed)); + TRACE("instance count %u\n", This->instance_count); if (fixed->name_size_offset + sizeof(USHORT) < size) unicode_strings_size = load_unicode_strings(task, data + fixed->name_size_offset, size - fixed->name_size_offset); @@ -1463,6 +1467,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); + This->flags = 0; This->status = SCHED_S_TASK_NOT_SCHEDULED; This->idle_minutes = 10; This->deadline_minutes = 60; @@ -1471,6 +1476,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->trigger_count = 0; This->trigger = NULL; This->is_dirty = FALSE; + This->instance_count = 0; /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000; -- 2.16.3

1 0

[PATCH 03/12] mstask: Don't touch instance count field of the job file in the client.
by Dmitry Timoshkov 11 May '18

11 May '18

It should be managed on the server side. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 986faa1654..5ec7064560 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1260,9 +1260,8 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta goto failed; } - /* Instance Count */ - word = 0; - if (!WriteFile(hfile, &word, sizeof(word), &size, NULL)) + /* Instance Count: don't touch it in the client */ + if (SetFilePointer(hfile, sizeof(word), NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { hr = HRESULT_FROM_WIN32(GetLastError()); goto failed; -- 2.16.3

1 0

[PATCH 02/12] schedsvc: Pass full task file name to remove_job()/add_job().
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/svc_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 848e4fc105..f021d63b98 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -118,8 +118,8 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) GetWindowsDirectoryW(path, MAX_PATH); lstrcatW(path, tasksW); lstrcatW(path, info.data.FileName); - remove_job(info.data.FileName); - add_job(info.data.FileName); + remove_job(path); + add_job(path); break; default: -- 2.16.3

1 0

[PATCH 01/12] mstask: Implement ITaskScheduler::Delete().
by Dmitry Timoshkov 11 May '18

11 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_scheduler.c | 23 ++++++++++++++++++----- dlls/mstask/tests/task_scheduler.c | 17 +++++++++++++---- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 42e773849c..416a3218d0 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -302,12 +302,25 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Activate(ITaskScheduler *iface, return hr; } -static HRESULT WINAPI MSTASK_ITaskScheduler_Delete( - ITaskScheduler* iface, - LPCWSTR pwszName) +static HRESULT WINAPI MSTASK_ITaskScheduler_Delete(ITaskScheduler *iface, LPCWSTR name) { - FIXME("%p, %s: stub\n", iface, debugstr_w(pwszName)); - return E_NOTIMPL; + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + static const WCHAR jobW[] = { '.','j','o','b',0 }; + WCHAR task_name[MAX_PATH]; + + TRACE("%p, %s\n", iface, debugstr_w(name)); + + if (strchrW(name, '.')) return E_INVALIDARG; + + GetWindowsDirectoryW(task_name, MAX_PATH); + lstrcatW(task_name, tasksW); + lstrcatW(task_name, name); + lstrcatW(task_name, jobW); + + if (!DeleteFileW(task_name)) + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; } static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 8b93b56dce..d4766382ec 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -249,7 +249,7 @@ static void test_save_task_curfile(ITask *task) curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); ok(hr == S_OK, "GetCurFile error %#x\n", hr); - ok(curfile && curfile[0] , "curfile should not be NULL\n"); + ok(curfile && curfile[0], "curfile should not be NULL\n"); ok(file_exists(curfile), "curfile should exist\n"); @@ -343,6 +343,12 @@ static void test_task_storage(void) return; } + hr = ITaskScheduler_Delete(scheduler, Task1_ext); + ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); + + hr = ITaskScheduler_Delete(scheduler, Task1); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + hr = ITaskScheduler_NewWorkItem(scheduler, Task1_ext, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); @@ -418,9 +424,12 @@ static void test_task_storage(void) test_save_task_curfile(task); - DeleteFileW(task1_full_name); - DeleteFileW(task2_full_name); - DeleteFileW(task3_full_name); + hr = ITaskScheduler_Delete(scheduler, Task1); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITaskScheduler_Delete(scheduler, Task2); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITaskScheduler_Delete(scheduler, Task3); + ok(hr == S_OK, "got %#x\n", hr); ITask_Release(task); ITaskScheduler_Release(scheduler); -- 2.16.3

1 0

[PATCH] ntdll: Add stub for RtlIpv6StringToAddressExW.
by Alistair Leslie-Hughes 11 May '18

11 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 38ffad3..e2f5117 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -735,7 +735,7 @@ # @ stub RtlIpv6AddressToStringW # @ stub RtlIpv6StringToAddressA # @ stub RtlIpv6StringToAddressExA -# @ stub RtlIpv6StringToAddressExW +@ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr) # @ stub RtlIpv6StringToAddressW @ stdcall RtlIsActivationContextActive(ptr) @ stdcall RtlIsCriticalSectionLocked(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 8ade752..5a095e9 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -45,6 +45,7 @@ #include "wine/unicode.h" #include "ntdll_misc.h" #include "inaddr.h" +#include "in6addr.h" #include "ddk/ntddk.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -903,6 +904,16 @@ NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const } /*********************************************************************** + * RtlIpv6StringToAddressExW [NTDLL.@] + */ +NTSTATUS NTAPI RtlIpv6StringToAddressExW(LPCWSTR str, IN6_ADDR *address, PULONG scope, PUSHORT port) +{ + FIXME("(%s, %p, %p, %p): stub\n", debugstr_w(str), address, scope, port); + + return STATUS_INVALID_PARAMETER; +} + +/*********************************************************************** * RtlIpv4AddressToStringExW [NTDLL.@] * * Convert the given ipv4 address and optional the port to a string diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 46c03ec..bb6e048 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1096,7 +1096,7 @@ @ stub RtlIpv6AddressToStringW @ stub RtlIpv6StringToAddressA @ stub RtlIpv6StringToAddressExA -@ stub RtlIpv6StringToAddressExW +@ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr) ntdll.RtlIpv6StringToAddressExW @ stub RtlIpv6StringToAddressW @ stub RtlIsGenericTableEmpty @ stub RtlIsGenericTableEmptyAvl -- 1.9.1

1 0

[PATCH 3/3] testbot: Reschedule at the latest when the next task times out.
by Francois Gouget 10 May '18

10 May '18

This ensures we catch stuck tasks in a timely fashion. Note that we still reschedule every 10 minutes to catch any issues but the scheduler handles this itself instead of relying on SafetyNet(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 14 ++++++------ testbot/lib/WineTestBot/Engine/Scheduler.pm | 24 +++++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index c3db46b12..0f8de82af 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -611,11 +611,10 @@ sub ClientRead($) This is called on startup and regularly after that to catch things that fall through the cracks, possibly because of an Engine restart. -Specifically it updates the status of all the current Jobs, Steps and -Tasks, then schedules Tasks to be run, checks the staging directory for -wine-patches emails dropped by WinePatchesMLSubmit.pl, for notifications of -changes on Wine's Patches web site dropped by WinePatchesWebSubmit.pl, and -checks whether any pending patchsets are now complete and thus can be scheduled. +Specifically it checks the staging directory for wine-patches emails dropped +by WinePatchesMLSubmit.pl, for notifications of changes on Wine's Patches web +site dropped by WinePatchesWebSubmit.pl, and checks whether any pending +patchsets are now complete and thus can be scheduled. =back =cut @@ -623,7 +622,6 @@ checks whether any pending patchsets are now complete and thus can be scheduled. sub SafetyNet() { CheckJobs(); - ScheduleJobs(); HandleWinePatchWebSubmission(); my $Set = CreatePendingPatchSets(); @@ -760,6 +758,10 @@ sub main() SaveRecord('engine', 'start'); Cleanup(1); + # Cleanup starts processes to update the VMs. Run ScheduleJobs() now so it + # can detect if these processes get stuck. + ScheduleJobs(); + # Check for patches that arrived while the server was off. HandleWinePatchMLSubmission(); diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 52e7619dd..a191f0e1c 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -31,6 +31,7 @@ use Exporter 'import'; our @EXPORT = qw(ScheduleJobs CheckJobs); use WineTestBot::Config; +use WineTestBot::Engine::Events; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::RecordGroups; @@ -971,6 +972,29 @@ sub ScheduleJobs() { $Sched->{recordgroups}->DeleteItem($Sched->{recordgroup}); } + + # Reschedule at the latest when the next task times out + my $FirstDeadline; + foreach my $VM (@{$Sched->{VMs}->GetItems()}) + { + if (defined $VM->ChildDeadline and + (!defined $FirstDeadline or $VM->ChildDeadline < $FirstDeadline)) + { + $FirstDeadline = $VM->ChildDeadline; + } + } + my $Timeout; + if ($FirstDeadline) + { + $Timeout = $FirstDeadline - time(); + $Timeout = 1 if ($Timeout <= 0); + } + if (!$Timeout or $Timeout > 600) + { + # Reschedule regularly as a safety net + $Timeout = 600; + } + AddEvent("ScheduleJobs", $Timeout, 0, \&ScheduleJobs); } -- 2.17.0

1 0

[PATCH 2/3] testbot: Let the scheduler log scheduling errors.
by Francois Gouget 10 May '18

10 May '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 24 +++------------- testbot/lib/WineTestBot/Engine/Scheduler.pm | 32 +++++++-------------- 2 files changed, 14 insertions(+), 42 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index fae406702..c3db46b12 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -351,11 +351,7 @@ sub HandleJobCancel($) return "0$ErrMessage"; } - $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleJobCancel: $ErrMessage\n"; - } + ScheduleJobs(); return "1OK"; } @@ -381,22 +377,14 @@ sub HandleJobRestart($) return "0$ErrMessage"; } - $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleJobRestart: $ErrMessage\n"; - } + ScheduleJobs(); return "1OK"; } sub HandleRescheduleJobs() { - my $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleRescheduleJobs: $ErrMessage\n"; - } + ScheduleJobs(); return "1OK"; } @@ -411,11 +399,7 @@ sub HandleVMStatusChange($$$) return "0Invalid status"; } - my $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleVMStatusChange: $ErrMessage\n"; - } + ScheduleJobs(); return "1OK"; } diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 52a6cedef..52e7619dd 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -354,7 +354,7 @@ sub _CheckAndClassifyVMs() if (_CanScheduleOnVM($Sched, $VM)) { my $ErrMessage = $VM->RunMonitor(); - return ($ErrMessage, undef) if (defined $ErrMessage); + LogMsg "$ErrMessage\n" if (defined $ErrMessage); } # Ignore the VM for this round since we cannot use it $Sched->{busyvms}->{$VMKey} = 1; @@ -389,7 +389,7 @@ sub _CheckAndClassifyVMs() # continuing with the scheduling. CheckJobs() if ($FoundVMErrors); - return (undef, $Sched); + return $Sched; } =pod @@ -627,7 +627,7 @@ sub _ScheduleTasks($) $Sched->{busyvms}->{$VMKey} = 1; $VM->RecordStatus($Sched->{records}, join(" ", "running", $Job->Id, $Step->No, $Task->No)); my $ErrMessage = $Task->Run($Step); - return ($ErrMessage, undef) if (defined $ErrMessage); + LogMsg "$ErrMessage\n" if (defined $ErrMessage); $Job->UpdateStatus(); $Host->{idle}--; @@ -660,7 +660,7 @@ sub _ScheduleTasks($) _AddNeededVM($NeededVMs, $VM, $Niceness); } - return (undef, $NeededVMs); + return $NeededVMs; } =pod @@ -865,12 +865,11 @@ sub _RevertVMs($$) delete $Sched->{lambvms}->{$VMKey}; $Sched->{busyvms}->{$VMKey} = 1; my $ErrMessage = $VM->RunRevert(); - return $ErrMessage if (defined $ErrMessage); + LogMsg "$ErrMessage\n" if (defined $ErrMessage); $Host->{active}++ if ($VMStatus eq "off"); $Host->{reverting}++; } } - return undef; } sub _PowerOffDirtyVMs($) @@ -886,9 +885,8 @@ sub _PowerOffDirtyVMs($) $VM->RecordStatus($Sched->{records}, "dirty poweroff"); my $ErrMessage = $VM->RunPowerOff(); - return $ErrMessage if (defined $ErrMessage); + LogMsg "$ErrMessage\n" if (defined $ErrMessage); } - return undef; } my $_LastTaskCounts = ""; @@ -949,18 +947,10 @@ kept on standby so they are ready when their turn comes. sub ScheduleJobs() { - my ($ErrMessage, $Sched) = _CheckAndClassifyVMs(); - return $ErrMessage if ($ErrMessage); - - my $NeededVMs; - ($ErrMessage, $NeededVMs) = _ScheduleTasks($Sched); - return $ErrMessage if ($ErrMessage); - - $ErrMessage = _RevertVMs($Sched, $NeededVMs); - return $ErrMessage if ($ErrMessage); - - $ErrMessage = _PowerOffDirtyVMs($Sched); - return $ErrMessage if ($ErrMessage); + my $Sched = _CheckAndClassifyVMs(); + my $NeededVMs = _ScheduleTasks($Sched); + _RevertVMs($Sched, $NeededVMs); + _PowerOffDirtyVMs($Sched); # Note that any VM Status or Role change will trigger ScheduleJobs() so this # records all not yet recorded VM state changes, even those not initiated by @@ -981,8 +971,6 @@ sub ScheduleJobs() { $Sched->{recordgroups}->DeleteItem($Sched->{recordgroup}); } - - return undef; } -- 2.17.0

1 0

[PATCH 1/3] testbot/Engine: Let event handlers add / remove events.
by Francois Gouget 10 May '18

10 May '18

This makes it possible to handle events that happen at irregular intervals: the event is created as non-repeating and the event handler computes when the next event should happen and adds it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Engine/Events.pm | 70 ++++++++++++++---------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Events.pm b/testbot/lib/WineTestBot/Engine/Events.pm index 677debfbf..f1ab39ac9 100644 --- a/testbot/lib/WineTestBot/Engine/Events.pm +++ b/testbot/lib/WineTestBot/Engine/Events.pm @@ -37,10 +37,11 @@ sub AddEvent($$$$) { my ($Name, $Timeout, $Repeat, $HandlerFunc) = @_; - $Events{$Name} = {Expires => time() + $Timeout, - Timeout => $Timeout, - Repeat => $Repeat, - HandlerFunc => $HandlerFunc}; + $Events{$Name} = { Name => $Name, + Expires => time() + $Timeout, + Timeout => $Timeout, + Repeat => $Repeat, + HandlerFunc => $HandlerFunc }; } sub DeleteEvent($) @@ -54,42 +55,51 @@ sub EventScheduled($) { my ($Name) = @_; - return defined($Events{$Name}); + return exists $Events{$Name}; } sub RunEvents() { my $Now = time(); - my $Next = undef; - foreach my $Name (keys %Events) + # Run expired events in their expiration order. + # Note that callbacks may add / remove events. + my @SortedEvents = sort { $a->{Expires} <=> $b->{Expires} } values %Events; + foreach my $Event (@SortedEvents) { - my $Event = $Events{$Name}; - if (defined($Event)) + if (!exists $Events{$Event->{Name}}) + { + # This event got removed by a callback + next; + } + + if ($Event->{Expires} > $Now) + { + # Since the events are sorted by expiration order, + # there is no other event to run. + last; + } + + if ($Event->{Repeat}) { - if ($Event->{Expires} <= $Now) - { - if ($Event->{Repeat}) - { - $Event->{Expires} += $Event->{Timeout}; - if (! defined($Next) || $Event->{Expires} - $Now < $Next) - { - $Next = $Event->{Expires} - $Now; - } - } - else - { - delete $Events{$Name}; - } - &{$Event->{HandlerFunc}}(); - } - elsif (! defined($Next) || $Event->{Expires} - $Now < $Next) - { - $Next = $Event->{Expires} - $Now; - } + $Event->{Expires} += $Event->{Timeout}; } + else + { + delete $Events{$Event->{Name}}; + } + &{$Event->{HandlerFunc}}(); } - return $Next; + # Determine when the next event is due + my $Next = undef; + foreach my $Event (values %Events) + { + if (!defined $Next or $Event->{Expires} - $Now < $Next) + { + $Next = $Event->{Expires} - $Now; + } + } + return $Next <= 0 ? 1 : $Next; } 1; -- 2.17.0

1 0

[PATCH] setupapi: set LastError on success in SetupInstallFromInfSectionW
by Austin English 10 May '18

10 May '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=45167 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/setupapi/install.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 0593df892e..5a76e3a581 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1188,6 +1188,7 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, return FALSE; } + SetLastError(ERROR_SUCCESS); return TRUE; } -- 2.16.1

1 0

[PATCH 6/6] jscript: Make RegExp object properties non-writable.
by Jacek Caban 10 May '18

10 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsregexp.c | 40 ++++++++-------------------------------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 12 insertions(+), 32 deletions(-)

1 0

[PATCH 5/6] jscript: Make Function instance object properties non-writable.
by Jacek Caban 10 May '18

10 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 14 ++++---------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 8 insertions(+), 10 deletions(-)

1 0

[PATCH 4/6] jscript: Make String.length non-writable.
by Jacek Caban 10 May '18

10 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/string.c | 10 ++-------- dlls/jscript/tests/api.js | 6 ++++++ dlls/mshtml/tests/es5.js | 1 + 3 files changed, 9 insertions(+), 8 deletions(-)

1 0

[PATCH 3/6] jscript: Use jsdisp_get_own_property in Object.propertyIsEnumerable implementation.
by Jacek Caban 10 May '18

10 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 13 ------------- dlls/jscript/jscript.h | 1 - dlls/jscript/object.c | 8 ++++---- 3 files changed, 4 insertions(+), 18 deletions(-)

1 0

[PATCH 2/6] jscript: Use jsdisp_get_own_property in Object.hasOwnProperty implementation.
by Jacek Caban 10 May '18

10 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 13 ------------- dlls/jscript/jscript.h | 1 - dlls/jscript/object.c | 17 +++++++++-------- 3 files changed, 9 insertions(+), 22 deletions(-)

1 0

[PATCH 1/6] jscript: Added Object.getOwnPropertyDescriptor implementation.
by Jacek Caban 10 May '18

10 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 32 +++++++++++++++ dlls/jscript/jscript.h | 7 ++++ dlls/jscript/object.c | 83 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 4 ++ dlls/mshtml/tests/es5.js | 43 +++++++++++++++++--- 5 files changed, 163 insertions(+), 6 deletions(-)

1 0

[PATCH v2] feclient: Add stub dll.
by Gijs Vermeulen 10 May '18

10 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- v2: update .spec to Windows 10 For https://bugs.winehq.org/show_bug.cgi?id=40451 configure.ac | 1 + dlls/feclient/Makefile.in | 4 ++++ dlls/feclient/feclient.spec | 50 +++++++++++++++++++++++++++++++++++++++++++++ dlls/feclient/main.c | 45 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+) create mode 100644 dlls/feclient/Makefile.in create mode 100644 dlls/feclient/feclient.spec create mode 100644 dlls/feclient/main.c diff --git a/configure.ac b/configure.ac index 54c31d86c8..195271ed44 100644 --- a/configure.ac +++ b/configure.ac @@ -3282,6 +3282,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) +WINE_CONFIG_MAKEFILE(dlls/feclient) WINE_CONFIG_MAKEFILE(dlls/fltlib) WINE_CONFIG_MAKEFILE(dlls/fltmgr.sys) WINE_CONFIG_MAKEFILE(dlls/fntcache) diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in new file mode 100644 index 0000000000..d3eeefb0cc --- /dev/null +++ b/dlls/feclient/Makefile.in @@ -0,0 +1,4 @@ +MODULE = feclient.dll + +C_SRCS = \ + main.c diff --git a/dlls/feclient/feclient.spec b/dlls/feclient/feclient.spec new file mode 100644 index 0000000000..2cf4a63258 --- /dev/null +++ b/dlls/feclient/feclient.spec @@ -0,0 +1,50 @@ +@ stub EdpAllowFileAccessForProcess +@ stub EdpConsumerCredentialCreate +@ stub EdpConsumerCredentialQuery +@ stub EdpContainerizeFile +@ stub EdpCredentialCreate +@ stub EdpCredentialDelete +@ stub EdpCredentialExists +@ stub EdpCredentialQuery +@ stub EdpDecontainerizeFile +@ stub EdpDplPolicyEnabledForUser +@ stub EdpDplStartCredServiceIfDplEnabledForUser +@ stub EdpDplUpgradePinInfo +@ stub EdpDplUpgradeVerifyUser +@ stub EdpDplUserCredentialsSet +@ stub EdpDplUserUnlockComplete +@ stub EdpDplUserUnlockStart +@ stub EdpFree +@ stub EdpGetContainerIdentity +@ stub EdpGetCredServiceState +@ stub EdpIsConsumerDataProtectionEnforced +@ stub EdpIsConsumerDataProtectionSupported +@ stub EdpPurgeAppLearningEvents +@ stub EdpQueryCredServiceInfo +@ stub EdpQueryDplEnforcedPolicyOwnerIds +@ stub EdpQueryRevokedPolicyOwnerIds +@ stub EdpRmsClearKeys +@ stub EdpSetCredServiceInfo +@ stub EdpUnprotectFile +@ stub EdpWriteLogSiteLearningEvents +@ stub EfsClientCloseFileRaw +@ stub EfsClientCopyFileRaw +@ stub EfsClientDecryptFile +@ stub EfsClientDuplicateEncryptionInfo +@ stub EfsClientEncryptFileEx +@ stub EfsClientFileEncryptionStatus +@ stub EfsClientFreeKeyInfo +@ stub EfsClientFreeProtectorList +@ stub EfsClientGetEncryptedFileVersion +@ stub EfsClientGetKeyInfo +@ stub EfsClientOpenFileRaw +@ stub EfsClientQueryProtectors +@ stub EfsClientReadFileRaw +@ stub EfsClientWriteFileRaw +@ stub EfsClientWriteFileWithHeaderRaw +@ stub EfsReprotectFile +@ stub EfsUtilGetCurrentKey +@ stub FeClientInitialize +@ stub GetLockSessionUnwrappedKey +@ stub GetLockSessionWrappedKey +@ stub OefsCheckSupport diff --git a/dlls/feclient/main.c b/dlls/feclient/main.c new file mode 100644 index 0000000000..91aed70ec8 --- /dev/null +++ b/dlls/feclient/main.c @@ -0,0 +1,45 @@ +/* + * feclient API + * + * Copyright 2016 Michael Müller + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(feclient); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} -- 2.13.6

1 0

[PATCH] hnetcfg/tests: Ignore case when comparing filenames.
by Hans Leidekker 10 May '18

10 May '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/hnetcfg/tests/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 4d70818293..4ee19d8db4 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -141,7 +141,7 @@ static void test_NetFwAuthorizedApplication(void) hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); ok(hr == S_OK, "got: %08x\n", hr); - ok(!lstrcmpW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr)); + ok(!lstrcmpiW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr)); SysFreeString( bstr ); SysFreeString( image ); -- 2.11.0

1 0

[PATCH] feclient: Add stub dll.
by Gijs Vermeulen 10 May '18

10 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- For https://bugs.winehq.org/show_bug.cgi?id=40451 configure.ac | 1 + dlls/feclient/Makefile.in | 4 ++++ dlls/feclient/feclient.spec | 36 ++++++++++++++++++++++++++++++++++++ dlls/feclient/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+) create mode 100644 dlls/feclient/Makefile.in create mode 100644 dlls/feclient/feclient.spec create mode 100644 dlls/feclient/main.c diff --git a/configure.ac b/configure.ac index 54c31d86c8..195271ed44 100644 --- a/configure.ac +++ b/configure.ac @@ -3282,6 +3282,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) +WINE_CONFIG_MAKEFILE(dlls/feclient) WINE_CONFIG_MAKEFILE(dlls/fltlib) WINE_CONFIG_MAKEFILE(dlls/fltmgr.sys) WINE_CONFIG_MAKEFILE(dlls/fntcache) diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in new file mode 100644 index 0000000000..d3eeefb0cc --- /dev/null +++ b/dlls/feclient/Makefile.in @@ -0,0 +1,4 @@ +MODULE = feclient.dll + +C_SRCS = \ + main.c diff --git a/dlls/feclient/feclient.spec b/dlls/feclient/feclient.spec new file mode 100644 index 0000000000..3620b85cff --- /dev/null +++ b/dlls/feclient/feclient.spec @@ -0,0 +1,36 @@ +@ stub EdpContainerizeFile +@ stub EdpCredentialCreate +@ stub EdpCredentialDelete +@ stub EdpCredentialExists +@ stub EdpCredentialQuery +@ stub EdpDecontainerizeFile +@ stub EdpDplPolicyEnabledForUser +@ stub EdpDplUpgradePinInfo +@ stub EdpDplUpgradeVerifyUser +@ stub EdpDplUserCredentialsSet +@ stub EdpDplUserUnlockComplete +@ stub EdpDplUserUnlockStart +@ stub EdpFree +@ stub EdpGetContainerIdentity +@ stub EdpGetCredServiceState +@ stub EdpQueryCredServiceInfo +@ stub EdpQueryDplEnforcedPolicyOwnerIds +@ stub EdpQueryRevokedPolicyOwnerIds +@ stub EdpRmsClearKeys +@ stub EdpSetCredServiceInfo +@ stub EfsClientCloseFileRaw +@ stub EfsClientDecryptFile +@ stub EfsClientDuplicateEncryptionInfo +@ stub EfsClientEncryptFileEx +@ stub EfsClientFileEncryptionStatus +@ stub EfsClientFreeProtectorList +@ stub EfsClientGetEncryptedFileVersion +@ stub EfsClientOpenFileRaw +@ stub EfsClientQueryProtectors +@ stub EfsClientReadFileRaw +@ stub EfsClientWriteFileRaw +@ stub EfsClientWriteFileWithHeaderRaw +@ stub EfsUtilGetCurrentKey +@ stub FeClientInitialize +@ stub GetLockSessionUnwrappedKey +@ stub GetLockSessionWrappedKey diff --git a/dlls/feclient/main.c b/dlls/feclient/main.c new file mode 100644 index 0000000000..91aed70ec8 --- /dev/null +++ b/dlls/feclient/main.c @@ -0,0 +1,45 @@ +/* + * feclient API + * + * Copyright 2016 Michael Müller + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(feclient); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} -- 2.13.6

1 0

[PATCH] configure: Detect MinGW-w64 ARM64 toolchains.
by Martin Storsjo 10 May '18

10 May '18

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- aclocal.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 index 6ad8363..289ee92 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -191,6 +191,8 @@ dnl Usage: WINE_CHECK_MINGW_PROG(variable,[value-if-not-found],[path]) dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in + aarch64*) + ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; arm*) ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; i[[3456789]]86*) -- 2.7.4

2 1

[PATCH] ws2_32: Enable IP_DONTFRAGMENT by default for SOCK_STREAM sockets.
by Hans Leidekker 10 May '18

10 May '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ws2_32/socket.c | 9 ++++++-- dlls/ws2_32/tests/sock.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 25ec72a212..d69902c2d1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7532,9 +7532,14 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (ipxptype > 0) set_ipx_packettype(ret, ipxptype); - /* ensure IP_DONTFRAGMENT is disabled, in Linux the global default can be enabled */ if (unixaf == AF_INET || unixaf == AF_INET6) - set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); + { + /* ensure IP_DONTFRAGMENT is disabled for SOCK_DGRAM and SOCK_RAW, enabled for SOCK_STREAM */ + if (unixtype == SOCK_DGRAM || unixtype == SOCK_RAW) /* in Linux the global default can be enabled */ + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); + else if (unixtype == SOCK_STREAM) + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, TRUE); + } #ifdef IPV6_V6ONLY if (unixaf == AF_INET6) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 05495b4d39..6dd1491bc0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1908,6 +1908,59 @@ todo_wine ok(value == 1, "Expected 1, got %d\n", value); closesocket(s); + + s = socket(family, SOCK_STREAM, 0); + if (s == INVALID_SOCKET && i) + { + skip("IPv6 is not supported\n"); + break; + } + ok(s != INVALID_SOCKET, "socket failed with error %d\n", GetLastError()); + + size = sizeof(value); + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 1 || broken(value == 0) /* < vista */, "Expected 1, got %d\n", value); + + size = sizeof(value); + value = 0; + err = setsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 0, "Expected 0, got %d\n", value); + + closesocket(s); + + s = socket(family, SOCK_RAW, 0); + if (s == INVALID_SOCKET) + { + if (WSAGetLastError() == WSAEACCES) skip("SOCK_RAW is not available\n"); + else if (i) skip("IPv6 is not supported\n"); + break; + } + ok(s != INVALID_SOCKET, "socket failed with error %d\n", GetLastError()); + + size = sizeof(value); + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 0, "Expected 0, got %d\n", value); + + size = sizeof(value); + value = 1; + err = setsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 1, "Expected 1, got %d\n", value); + + closesocket(s); } } -- 2.11.0

1 0

[PATCH v2] ole32/tests: Improve tests for OLE's default object handler.
by Sergio Gómez Del Real 10 May '18

10 May '18

This patch reworks the structure of the tests for OLE's default object handler. We want, at least, to: - Test its behaviour when object is not running. - Test its behaviour when is being aggregated by a custom handler. - Test that it delegates appropriately to datacache. - Test that it delegates appropriately to running object. The present patch adds a local server (EXE), ands tests that some calls in some interfaces are delegated to it after calling _Run on the IRunnableObject interface. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/tests/defaulthandler.c | 687 ++++++++++++++++++++++++++++++-------- 1 file changed, 545 insertions(+), 142 deletions(-) diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index 60bc29c08d..776cda2eef 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -60,24 +60,31 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHARS_IN_GUID 39 +#define CLSID_KEY_LEN (CHARS_IN_GUID+6) + DEFINE_EXPECT(CF_QueryInterface_ClassFactory); -DEFINE_EXPECT(CF_CreateInstance); -DEFINE_EXPECT(CF_QueryInterface_IMarshal); +DEFINE_EXPECT(OleObject_Update); +DEFINE_EXPECT(PStorage_InitNew); -static HRESULT create_storage(IStorage **stg) +struct TestClass { - HRESULT hr; - ILockBytes *lock_bytes; + IUnknown IUnknown_iface; + IOleObject IOleObject_iface; + IDataObject IDataObject_iface; + IPersistStorage IPersistStorage_iface; - hr = CreateILockBytesOnHGlobal(NULL, TRUE, &lock_bytes); - if(SUCCEEDED(hr)) - { - hr = StgCreateDocfileOnILockBytes(lock_bytes, - STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, stg); - ILockBytes_Release(lock_bytes); - } - return hr; -} + LONG ref; + CLSID clsid; +}; +typedef struct TestClass TestClass; + +const CLSID CLSID_Test_Server = {0x0f77e570,0x80c3,0x11e2,{0x9e,0x96,0x08,0x00,0x20,0x0c,0x9a,0x66}}; +static WCHAR clsid_key[CLSID_KEY_LEN] = {'C','L','S','I','D','\\',0}; +static int wine_argc; +static char **wine_argv; +static IUnknown *dfhandler_unk; +static TestClass *test_class; typedef struct { @@ -88,84 +95,364 @@ typedef struct DWORD moniker_size; } ole_stream_header_t; -static void test_olestream(void) +static HRESULT WINAPI TC_IUnknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - HRESULT hr; - const CLSID non_existent_class = {0xa5f1772f, 0x3772, 0x490f, {0x9e, 0xc6, 0x77, 0x13, 0xe8, 0xb3, 0x4b, 0x5d}}; - IOleObject *ole_obj; - IPersistStorage *persist; - IStorage *stg; - IStream *stm; - static const WCHAR olestream[] = {1,'O','l','e',0}; - ULONG read; - ole_stream_header_t header; - - hr = create_storage(&stg); - ok(hr == S_OK, "got %08x\n", hr); - - hr = IStorage_OpenStream(stg, olestream, NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, 0, &stm); - ok(hr == STG_E_FILENOTFOUND, "got %08x\n", hr); - - hr = OleCreateDefaultHandler(&non_existent_class, 0, &IID_IOleObject, (void**)&ole_obj); - ok(hr == S_OK, "got %08x\n", hr); - - hr = IOleObject_QueryInterface(ole_obj, &IID_IPersistStorage, (void**)&persist); - ok(hr == S_OK, "got %08x\n", hr); - - hr = IPersistStorage_InitNew(persist, stg); - ok(hr == S_OK, "got %08x\n", hr); - - hr = IStorage_OpenStream(stg, olestream, NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, 0, &stm); - ok(hr == S_OK, "got %08x\n", hr); - hr = IStream_Read(stm, &header, sizeof(header), &read); - ok(hr == S_OK, "got %08x\n", hr); - ok(read == sizeof(header), "read %d\n", read); - ok(header.version == 0x02000001, "got version %08x\n", header.version); - ok(header.flags == 0x0, "got flags %08x\n", header.flags); - ok(header.link_update_opt == 0x0, "got link update option %08x\n", header.link_update_opt); - ok(header.res == 0x0, "got reserved %08x\n", header.res); - ok(header.moniker_size == 0x0, "got moniker size %08x\n", header.moniker_size); - - IStream_Release(stm); - - IPersistStorage_Release(persist); - IOleObject_Release(ole_obj); - - IStorage_Release(stg); -} - -static HRESULT WINAPI test_class_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) -{ - if(IsEqualGUID(riid, &IID_IUnknown)) { + if (IsEqualGUID(riid, &IID_IUnknown)) *ppv = iface; - return S_OK; - }else if(IsEqualGUID(riid, &IID_IOleObject)) { - ok(0, "unexpected query for IOleObject interface\n"); + else if (IsEqualGUID(riid, &IID_IOleObject)) + *ppv = &test_class->IOleObject_iface; + else if (IsEqualGUID(riid, &IID_IDataObject)) + *ppv = &test_class->IDataObject_iface; + else if (IsEqualGUID(riid, &IID_IPersistStorage)) + *ppv = &test_class->IPersistStorage_iface; + else { *ppv = NULL; return E_NOINTERFACE; } - *ppv = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; } -static ULONG WINAPI test_class_AddRef(IUnknown *iface) +static ULONG WINAPI TC_IUnknown_AddRef(IUnknown *iface) { - return 2; + return InterlockedIncrement(&test_class->ref); } -static ULONG WINAPI test_class_Release(IUnknown *iface) +static ULONG WINAPI TC_IUnknown_Release(IUnknown *iface) { - return 1; + return InterlockedDecrement(&test_class->ref); } -static const IUnknownVtbl test_class_vtbl = { - test_class_QueryInterface, - test_class_AddRef, - test_class_Release, +static const IUnknownVtbl TC_IUnknown_Vtbl = { + TC_IUnknown_QueryInterface, + TC_IUnknown_AddRef, + TC_IUnknown_Release, }; -static IUnknown test_class = { &test_class_vtbl }; +static HRESULT WINAPI TC_IOleObject_QueryInterface(IOleObject *iface, REFIID riid, void **ppv) +{ + return IUnknown_QueryInterface(&test_class->IUnknown_iface, riid, ppv); +} + +static ULONG WINAPI TC_IOleObject_AddRef(IOleObject *iface) +{ + return IUnknown_AddRef(&test_class->IUnknown_iface); +} + +static ULONG WINAPI TC_IOleObject_Release(IOleObject *iface) +{ + return IUnknown_Release(&test_class->IUnknown_iface); +} + +static HRESULT WINAPI TC_IOleObject_Advise(IOleObject *iface, IAdviseSink *advs, DWORD *conn) +{ + return S_OK; +} + +static HRESULT WINAPI TC_IOleObject_Close(IOleObject *iface, DWORD save_opt) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_DoVerb(IOleObject *iface, LONG verb, + LPMSG msg, IOleClientSite *actv, LONG lindex, HWND hwnd, LPCRECT pos_rec) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **stat) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_EnumVerbs(IOleObject *iface, IEnumOLEVERB **enumole) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_GetClientSite(IOleObject *iface, IOleClientSite **csite) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_GetClipboardData(IOleObject *iface, + DWORD res, IDataObject **dobj) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_GetExtent(IOleObject *iface, DWORD draw_asp, SIZEL *size) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_GetMiscStatus(IOleObject *iface, DWORD asp, DWORD *stat) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_GetMoniker(IOleObject *iface, DWORD assign, + DWORD which_mon, IMoniker **mon) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_GetUserClassID(IOleObject *iface, CLSID *clsid) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_GetUserType(IOleObject *iface, DWORD form, LPOLESTR *utype) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_InitFromData(IOleObject *iface, + IDataObject *dobj, BOOL creation, DWORD res) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_IsUpToDate(IOleObject *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_SetClientSite(IOleObject *iface, IOleClientSite *csite) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *logpal) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_SetExtent(IOleObject *iface, DWORD draw_asp, SIZEL *size) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_SetHostNames(IOleObject *iface, + LPCOLESTR cont_app, LPCOLESTR cont_obj) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_SetMoniker(IOleObject *iface, DWORD which_mon, IMoniker *mon) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_Unadvise(IOleObject *iface, DWORD conn) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IOleObject_Update(IOleObject *iface) +{ + HANDLE update_event; + + update_event = CreateEventA(NULL, FALSE, FALSE, "IOleObject_Update call in local server"); + SetEvent(update_event); + CloseHandle(update_event); + return S_OK; +} + +static const IOleObjectVtbl TC_IOleObject_Vtbl = { + TC_IOleObject_QueryInterface, + TC_IOleObject_AddRef, + TC_IOleObject_Release, + TC_IOleObject_SetClientSite, + TC_IOleObject_GetClientSite, + TC_IOleObject_SetHostNames, + TC_IOleObject_Close, + TC_IOleObject_SetMoniker, + TC_IOleObject_GetMoniker, + TC_IOleObject_InitFromData, + TC_IOleObject_GetClipboardData, + TC_IOleObject_DoVerb, + TC_IOleObject_EnumVerbs, + TC_IOleObject_Update, + TC_IOleObject_IsUpToDate, + TC_IOleObject_GetUserClassID, + TC_IOleObject_GetUserType, + TC_IOleObject_SetExtent, + TC_IOleObject_GetExtent, + TC_IOleObject_Advise, + TC_IOleObject_Unadvise, + TC_IOleObject_EnumAdvise, + TC_IOleObject_GetMiscStatus, + TC_IOleObject_SetColorScheme, +}; + +static HRESULT WINAPI TC_IDataObject_QueryInterface(IDataObject *iface, REFIID riid, void **ppv) +{ + return IUnknown_QueryInterface(&test_class->IUnknown_iface, riid, ppv); +} + +static ULONG WINAPI TC_IDataObject_AddRef(IDataObject *iface) +{ + return IUnknown_AddRef(&test_class->IUnknown_iface); +} + +static ULONG WINAPI TC_IDataObject_Release(IDataObject *iface) +{ + return IUnknown_Release(&test_class->IUnknown_iface); +} + +static HRESULT WINAPI TC_IDataObject_DAdvise(IDataObject *iface, FORMATETC *fmt, + DWORD adv, LPADVISESINK advs, DWORD *conn) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IDataObject_DUnadvise(IDataObject *iface, DWORD conn) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IDataObject_EnumDAdvise(IDataObject *iface, IEnumSTATDATA **stat) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IDataObject_EnumFormatEtc(IDataObject *iface, DWORD dir, IEnumFORMATETC **fmt) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IDataObject_GetCanonicalFormatEtc(IDataObject *iface, FORMATETC *in, FORMATETC *out) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IDataObject_GetData(IDataObject *iface, FORMATETC *fmt, STGMEDIUM *stg) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IDataObject_GetDataHere(IDataObject *iface, FORMATETC *fmt, STGMEDIUM *stg) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IDataObject_QueryGetData(IDataObject *iface, FORMATETC *fmt) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IDataObject_SetData(IDataObject *iface, FORMATETC *fmt, STGMEDIUM *med, BOOL rel) +{ + return E_NOTIMPL; +} + +static const IDataObjectVtbl TC_IDataObject_Vtbl = { + TC_IDataObject_QueryInterface, + TC_IDataObject_AddRef, + TC_IDataObject_Release, + TC_IDataObject_GetData, + TC_IDataObject_GetDataHere, + TC_IDataObject_QueryGetData, + TC_IDataObject_GetCanonicalFormatEtc, + TC_IDataObject_SetData, + TC_IDataObject_EnumFormatEtc, + TC_IDataObject_DAdvise, + TC_IDataObject_DUnadvise, + TC_IDataObject_EnumDAdvise, +}; + +static HRESULT WINAPI TC_IPersistStorage_QueryInterface(IPersistStorage *iface, REFIID riid, void **ppv) +{ + return IUnknown_QueryInterface(&test_class->IUnknown_iface, riid, ppv); +} + +static ULONG WINAPI TC_IPersistStorage_AddRef(IPersistStorage *iface) +{ + return IUnknown_AddRef(&test_class->IUnknown_iface); +} + +static ULONG WINAPI TC_IPersistStorage_Release(IPersistStorage *iface) +{ + return IUnknown_Release(&test_class->IUnknown_iface); +} + +static HRESULT WINAPI TC_IPersistStorage_GetClassID(IPersistStorage *iface, CLSID *clsid) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IPersistStorage_IsDirty(IPersistStorage *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IPersistStorage_InitNew(IPersistStorage *iface, IStorage *stg) +{ + HANDLE update_event; + + update_event = CreateEventA(NULL, FALSE, FALSE, "IPersistStorage_InitNew call in local server"); + SetEvent(update_event); + CloseHandle(update_event); + + return S_OK; +} + +static HRESULT WINAPI TC_IPersistStorage_Load(IPersistStorage *iface, IStorage *stg) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IPersistStorage_Save(IPersistStorage *iface, IStorage *stg, BOOL same_as_load) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IPersistStorage_SaveCompleted(IPersistStorage *iface, IStorage *stg) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI TC_IPersistStorage_HandsOffStorage(IPersistStorage *iface) +{ + return E_NOTIMPL; +} + +static const IPersistStorageVtbl TC_IPersistStorage_Vtbl = { + TC_IPersistStorage_QueryInterface, + TC_IPersistStorage_AddRef, + TC_IPersistStorage_Release, + TC_IPersistStorage_GetClassID, + TC_IPersistStorage_IsDirty, + TC_IPersistStorage_InitNew, + TC_IPersistStorage_Load, + TC_IPersistStorage_Save, + TC_IPersistStorage_SaveCompleted, + TC_IPersistStorage_HandsOffStorage, +}; + +static HRESULT create_testclass(IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + HRESULT hres; + + test_class = HeapAlloc(GetProcessHeap(), 0, sizeof(TestClass)); + + if (!test_class) + return E_OUTOFMEMORY; + + test_class->IUnknown_iface.lpVtbl = &TC_IUnknown_Vtbl; + test_class->IOleObject_iface.lpVtbl = &TC_IOleObject_Vtbl; + test_class->IDataObject_iface.lpVtbl = &TC_IDataObject_Vtbl; + test_class->IPersistStorage_iface.lpVtbl = &TC_IPersistStorage_Vtbl; + test_class->ref = 1; + test_class->clsid = CLSID_Test_Server; + + hres = IUnknown_QueryInterface(&test_class->IUnknown_iface, riid, ppv); + ok(hres == S_OK, "QuereyInterface failed with error %x\n", hres); + + return hres; +} static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { @@ -173,11 +460,13 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r *ppv = iface; return S_OK; }else if(IsEqualGUID(riid, &IID_IMarshal)) { - CHECK_EXPECT(CF_QueryInterface_IMarshal); *ppv = NULL; return E_NOINTERFACE; }else if(IsEqualGUID(riid, &IID_IClassFactory)) { - CHECK_EXPECT(CF_QueryInterface_ClassFactory); + HANDLE cf_event; + cf_event = CreateEventA(NULL, FALSE, FALSE, "Local server's CF"); + SetEvent(cf_event); + CloseHandle(cf_event); *ppv = iface; return S_OK; } @@ -200,7 +489,7 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { - CHECK_EXPECT(CF_CreateInstance); + HRESULT hres; ok(pUnkOuter == NULL, "pUnkOuter != NULL\n"); todo_wine ok(IsEqualGUID(riid, &IID_IUnknown), "riid = %s\n", wine_dbgstr_guid(riid)); @@ -209,8 +498,10 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, return E_NOINTERFACE; } - *ppv = &test_class; - return S_OK; + hres = create_testclass(pUnkOuter, riid, ppv); + ok(hres == S_OK, "create_testclass failed with error %x\n", hres); + + return hres; } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) @@ -229,91 +520,203 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { static IClassFactory ClassFactory = { &ClassFactoryVtbl }; -static void test_default_handler_run(void) +static HRESULT create_storage(IStorage **stg) { - const CLSID test_server_clsid = {0x0f77e570,0x80c3,0x11e2,{0x9e,0x96,0x08,0x00,0x20,0x0c,0x9a,0x66}}; + HRESULT hr; + ILockBytes *lock_bytes; - IUnknown *unk; + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &lock_bytes); + if(SUCCEEDED(hr)) + { + hr = StgCreateDocfileOnILockBytes(lock_bytes, + STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, stg); + ILockBytes_Release(lock_bytes); + } + return hr; +} + +static LONG register_server(void) +{ + LONG ret; + HKEY root; + char server_path[MAX_PATH]; + + lstrcpyA(server_path, wine_argv[0]); + lstrcatA(server_path, " defaulthandler"); + + StringFromGUID2(&CLSID_Test_Server, &clsid_key[6], CHARS_IN_GUID); + + ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_key, 0, NULL, 0, + KEY_READ | KEY_WRITE | KEY_CREATE_SUB_KEY, NULL, &root, NULL); + if (ret == ERROR_SUCCESS) + { + ret = RegSetValueA(root, "LocalServer32", REG_SZ, server_path, strlen(server_path)); + if (ret != ERROR_SUCCESS) + RegDeleteKeyA(root, "LocalServer32"); + RegCloseKey(root); + } + + return ret; +} + +static void unregister_server(void) +{ + HKEY root; + LONG ret; + + StringFromGUID2(&CLSID_Test_Server, &clsid_key[6], CHARS_IN_GUID); + + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_key, 0, NULL, 0, + DELETE, NULL, &root, NULL) == ERROR_SUCCESS) + { + ret = RegDeleteKeyA(root, "LocalServer32"); + ok(ret == ERROR_SUCCESS, "RegDeleteKey error %u\n", ret); + ret = RegDeleteKeyA(root, ""); + ok(ret == ERROR_SUCCESS, "RegDeleteKey error %u\n", ret); + RegCloseKey(root); + } +} + +static void run_local_server(void) +{ + DWORD class_reg; + HRESULT hres; + HANDLE finish_event; + + hres = CoRegisterClassObject(&CLSID_Test_Server, (IUnknown*)&ClassFactory, + CLSCTX_LOCAL_SERVER, 0, &class_reg); + ok(hres == S_OK, "CoRegisterClassObject failed: %x\n", hres); + + finish_event = CreateEventA(NULL, FALSE, FALSE, "Shutdown local server"); + WaitForSingleObject(finish_event, INFINITE); + CloseHandle(finish_event); + CoRevokeClassObject(class_reg); +} + +static void test_running_object(void) +{ IRunnableObject *ro; IOleObject *oleobj; - IPersistStorage *persist; - DWORD class_reg; + IStorage *stg; HRESULT hres; - - if(!GetProcAddress(GetModuleHandleA("ole32"), "CoRegisterSurrogateEx")) { - win_skip("skipping OleCreateDefaultHandler tests\n"); - return; - } - - hres = CoRegisterClassObject(&test_server_clsid, (IUnknown*)&ClassFactory, - CLSCTX_INPROC_SERVER, 0, &class_reg); - ok(hres == S_OK, "CoRegisterClassObject failed: %x\n", hres); - - hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres); - - hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&ro); + HANDLE update_event, finish_event, cf_event; + IPersistStorage *persist; + IStream *stm; + static const WCHAR olestream[] = {1,'O','l','e',0}; + ULONG read; + ole_stream_header_t header; + + hres = IUnknown_QueryInterface(dfhandler_unk, &IID_IRunnableObject, (void**)&ro); ok(hres == S_OK, "QueryInterface(IRunnableObject) failed: %x\n", hres); - IUnknown_Release(unk); + hres = IRunnableObject_IsRunning(ro); + ok(hres == FALSE, "Object shouldn't be running\n"); + + /* set object running and expect delegated calls */ + hres = IUnknown_QueryInterface(dfhandler_unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IOleObject) failed: %x\n", hres); + update_event = CreateEventA(NULL, FALSE, FALSE, "IOleObject_Update call in local server"); + cf_event = CreateEventA(NULL, FALSE, FALSE, "Local server's CF"); hres = IRunnableObject_Run(ro, NULL); - ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres); - IRunnableObject_Release(ro); + todo_wine ok(hres == S_OK, "Failed to run object. Returned value was %x\n", hres); + hres = IRunnableObject_IsRunning(ro); + todo_wine ok(hres == TRUE, "Object should be running\n"); - SET_EXPECT(CF_QueryInterface_IMarshal); - CoRevokeClassObject(class_reg); - todo_wine CHECK_CALLED(CF_QueryInterface_IMarshal); + SET_EXPECT(OleObject_Update); + hres = IOleObject_Update(oleobj); + todo_wine ok(hres == S_OK, "IOleObject_Update failed: %x\n", hres); + if (WaitForSingleObject(update_event, 3000) == WAIT_OBJECT_0) + CHECK_EXPECT2(OleObject_Update); + todo_wine CHECK_CALLED(OleObject_Update); + CloseHandle(update_event); - hres = CoRegisterClassObject(&test_server_clsid, (IUnknown*)&ClassFactory, - CLSCTX_LOCAL_SERVER, 0, &class_reg); - ok(hres == S_OK, "CoRegisterClassObject failed: %x\n", hres); + SET_EXPECT(CF_QueryInterface_ClassFactory); + if (WaitForSingleObject(cf_event, 3000) == WAIT_OBJECT_0) + CHECK_EXPECT2(CF_QueryInterface_ClassFactory); + CHECK_CALLED(CF_QueryInterface_ClassFactory); + CloseHandle(cf_event); - hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres); + /* test delegation to object's IPersistStorage */ + hres = create_storage(&stg); + ok(hres == S_OK, "got %08x\n", hres); - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %x\n", hres); + hres = IStorage_OpenStream(stg, olestream, NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, 0, &stm); + ok(hres == STG_E_FILENOTFOUND, "got %08x\n", hres); hres = IOleObject_QueryInterface(oleobj, &IID_IPersistStorage, (void**)&persist); - ok(hres == S_OK, "QueryInterface(IID_IPersistStorage) failed: %x\n", hres); + ok(hres == S_OK, "got %08x\n", hres); + + update_event = CreateEventA(NULL, FALSE, FALSE, "IPersistStorage_InitNew call in local server"); + SET_EXPECT(PStorage_InitNew); + hres = IPersistStorage_InitNew(persist, stg); + ok(hres == S_OK, "got %08x\n", hres); + if (WaitForSingleObject(update_event, 3000) == WAIT_OBJECT_0) + CHECK_EXPECT2(PStorage_InitNew); + todo_wine CHECK_CALLED(PStorage_InitNew); + CloseHandle(update_event); + + hres = IStorage_OpenStream(stg, olestream, NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, 0, &stm); + ok(hres == S_OK, "got %08x\n", hres); + hres = IStream_Read(stm, &header, sizeof(header), &read); + ok(hres == S_OK, "got %08x\n", hres); + ok(read == sizeof(header), "read %d\n", read); + ok(header.version == 0x02000001, "got version %08x\n", header.version); + ok(header.flags == 0x0, "got flags %08x\n", header.flags); + ok(header.link_update_opt == 0x0, "got link update option %08x\n", header.link_update_opt); + ok(header.res == 0x0, "got reserved %08x\n", header.res); + ok(header.moniker_size == 0x0, "got moniker size %08x\n", header.moniker_size); + + IStream_Release(stm); IPersistStorage_Release(persist); IOleObject_Release(oleobj); - - hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&ro); - ok(hres == S_OK, "QueryInterface(IRunnableObject) failed: %x\n", hres); - IUnknown_Release(unk); - - SET_EXPECT(CF_QueryInterface_ClassFactory); - SET_EXPECT(CF_CreateInstance); - hres = IRunnableObject_Run(ro, NULL); -todo_wine - ok(hres == S_OK, "Run failed: %x\n", hres); - CHECK_CALLED(CF_QueryInterface_ClassFactory); - CHECK_CALLED(CF_CreateInstance); IRunnableObject_Release(ro); + IStorage_Release(stg); - SET_EXPECT(CF_QueryInterface_ClassFactory); - SET_EXPECT(CF_CreateInstance); - hres = CoCreateInstance(&test_server_clsid, NULL, CLSCTX_LOCAL_SERVER, - &IID_IOleObject, (void**)&oleobj); -todo_wine - ok(hres == REGDB_E_CLASSNOTREG, "expected REGDB_E_CLASSNOTREG, got %x\n", hres); -todo_wine - CHECK_NOT_CALLED(CF_QueryInterface_ClassFactory); -todo_wine - CHECK_NOT_CALLED(CF_CreateInstance); - - SET_EXPECT(CF_QueryInterface_IMarshal); - CoRevokeClassObject(class_reg); - todo_wine CHECK_CALLED(CF_QueryInterface_IMarshal); + finish_event = CreateEventA(NULL, FALSE, FALSE, "Shutdown local server"); + SetEvent(finish_event); + CloseHandle(finish_event); } START_TEST(defaulthandler) { + HRESULT hres; + + wine_argc = winetest_get_mainargs( &wine_argv ); + if (wine_argc > 2 && !strncmp(wine_argv[2], "-Embedding", strnlen(wine_argv[2], 10))) + { + CoInitializeEx(NULL, COINIT_MULTITHREADED); + run_local_server(); + CoUninitialize(); + return; + } + OleInitialize(NULL); - test_olestream(); - test_default_handler_run(); + if (register_server() != ERROR_SUCCESS) + { + win_skip("not enough permissions to create a server CLSID key\n"); + OleUninitialize(); + return; + } + hres = OleCreateDefaultHandler(&CLSID_Test_Server, NULL, &IID_IUnknown, (void**)&dfhandler_unk); + ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres); + + if (FAILED(hres)) goto fail; + + test_running_object(); + /* + * TODO: + * - Test aggregating default handler from a custom handler. + * - Test delegation to datacache. + * - Test handler for non-running object. Some functions must + * save information for later delegation to object. + */ + + hres = IUnknown_Release(dfhandler_unk); + ok(hres == S_OK, "Failed to release default handler's IUnknown: %x\n", hres); + +fail: + unregister_server(); OleUninitialize(); } -- 2.14.1

2 3

[PATCH 2/2] wsdapi/tests: Add initial test for receiving probe messages.
by Owen Rudge 10 May '18

10 May '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 99 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+)

2 1

[PATCH 1/2] include: Add WSD_PROBE structure to wsdtypes.h.
by Owen Rudge 10 May '18

10 May '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- include/wsdtypes.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)

2 1

[v5 PATCH] user32/menu: Return locked menu data when looking for menu items.
by Nikolay Sivov 10 May '18

10 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v5: fixed a bug in RemoveMenu(), changed some argument names to make it more consistent. dlls/user32/menu.c | 564 ++++++++++++++++++++++++++++----------------- 1 file changed, 352 insertions(+), 212 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 537c2ebe1a..5b83703ace 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -584,26 +584,25 @@ static UINT MENU_GetStartOfPrevColumn( return i; } - - -/*********************************************************************** - * MENU_FindItem - * - * Find a menu item. Return a pointer on the item, and modifies *hmenu - * in case the item was in a sub-menu. - */ -static MENUITEM *MENU_FindItem( HMENU *hmenu, UINT *nPos, UINT wFlags ) +static POPUPMENU *find_menu_item(HMENU hmenu, UINT id, UINT flags, UINT *pos) { + UINT fallback_pos = ~0u, i; POPUPMENU *menu; - MENUITEM *fallback = NULL; - UINT fallback_pos = 0; - UINT i; - if ((*hmenu == (HMENU)0xffff) || (!(menu = MENU_GetMenu(*hmenu)))) return NULL; - if (wFlags & MF_BYPOSITION) + menu = grab_menu_ptr(hmenu); + if (!menu) + return NULL; + + if (flags & MF_BYPOSITION) { - if (*nPos >= menu->nItems) return NULL; - return &menu->items[*nPos]; + if (id >= menu->nItems) + { + release_menu_ptr(menu); + return NULL; + } + + if (pos) *pos = id; + return menu; } else { @@ -612,32 +611,36 @@ static MENUITEM *MENU_FindItem( HMENU *hmenu, UINT *nPos, UINT wFlags ) { if (item->fType & MF_POPUP) { - HMENU hsubmenu = item->hSubMenu; - MENUITEM *subitem = MENU_FindItem( &hsubmenu, nPos, wFlags ); - if (subitem) - { - *hmenu = hsubmenu; - return subitem; - } - else if (item->wID == *nPos) + POPUPMENU *submenu = find_menu_item(item->hSubMenu, id, flags, pos); + + if (submenu) + { + release_menu_ptr(menu); + return submenu; + } + else if (item->wID == id) { /* fallback to this item if nothing else found */ fallback_pos = i; - fallback = item; } } - else if (item->wID == *nPos) + else if (item->wID == id) { - *nPos = i; - return item; + if (pos) *pos = i; + return menu; } } } - if (fallback) - *nPos = fallback_pos; + if (fallback_pos != ~0u) + *pos = fallback_pos; + else + { + release_menu_ptr(menu); + menu = NULL; + } - return fallback; + return menu; } /*********************************************************************** @@ -2131,30 +2134,22 @@ static void MENU_MoveSelection( HWND hwndOwner, HMENU hmenu, INT offset ) /********************************************************************** - * MENU_InsertItem + * insert_menu_item * * Insert (allocate) a new item into a menu. */ -static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) +static POPUPMENU *insert_menu_item(HMENU hMenu, UINT id, UINT flags, UINT *ret_pos) { MENUITEM *newItems; POPUPMENU *menu; - - if (!(menu = MENU_GetMenu(hMenu))) - return NULL; + UINT pos = id; /* Find where to insert new item */ - - if (flags & MF_BYPOSITION) { - if (pos > menu->nItems) - pos = menu->nItems; - } else { - if (!MENU_FindItem( &hMenu, &pos, flags )) - pos = menu->nItems; - else { - if (!(menu = MENU_GetMenu( hMenu ))) - return NULL; - } + if (!(menu = find_menu_item(hMenu, id, flags, &pos))) + { + if (!(menu = grab_menu_ptr(hMenu))) + return NULL; + pos = menu->nItems; } /* Make sure that MDI system buttons stay on the right side. @@ -2172,6 +2167,7 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) newItems = HeapAlloc( GetProcessHeap(), 0, sizeof(MENUITEM) * (menu->nItems+1) ); if (!newItems) { + release_menu_ptr(menu); WARN("allocation failed\n" ); return NULL; } @@ -2187,7 +2183,9 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) menu->nItems++; memset( &newItems[pos], 0, sizeof(*newItems) ); menu->Height = 0; /* force size recalculate */ - return &newItems[pos]; + + *ret_pos = pos; + return menu; } @@ -3706,13 +3704,19 @@ BOOL WINAPI ChangeMenuW( HMENU hMenu, UINT pos, LPCWSTR data, */ DWORD WINAPI CheckMenuItem( HMENU hMenu, UINT id, UINT flags ) { + POPUPMENU *menu; MENUITEM *item; DWORD ret; + UINT pos; + + if (!(menu = find_menu_item(hMenu, id, flags, &pos))) + return -1; + item = &menu->items[pos]; - if (!(item = MENU_FindItem( &hMenu, &id, flags ))) return -1; ret = item->fState & MF_CHECKED; if (flags & MF_CHECKED) item->fState |= MF_CHECKED; else item->fState &= ~MF_CHECKED; + release_menu_ptr(menu); return ret; } @@ -3720,42 +3724,48 @@ DWORD WINAPI CheckMenuItem( HMENU hMenu, UINT id, UINT flags ) /********************************************************************** * EnableMenuItem (USER32.@) */ -BOOL WINAPI EnableMenuItem( HMENU hMenu, UINT wItemID, UINT wFlags ) +BOOL WINAPI EnableMenuItem( HMENU hMenu, UINT id, UINT wFlags ) { - UINT oldflags; - MENUITEM *item; + UINT oldflags, pos; POPUPMENU *menu; + MENUITEM *item; - TRACE("(%p, %04x, %04x) !\n", hMenu, wItemID, wFlags); + TRACE("(%p, %04x, %04x)\n", hMenu, id, wFlags); /* Get the Popupmenu to access the owner menu */ - if (!(menu = MENU_GetMenu(hMenu))) - return (UINT)-1; - - if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) + if (!(menu = find_menu_item(hMenu, id, wFlags, &pos))) return (UINT)-1; + item = &menu->items[pos]; oldflags = item->fState & (MF_GRAYED | MF_DISABLED); item->fState ^= (oldflags ^ wFlags) & (MF_GRAYED | MF_DISABLED); /* If the close item in the system menu change update the close button */ - if((item->wID == SC_CLOSE) && (oldflags != wFlags)) + if ((item->wID == SC_CLOSE) && (oldflags != wFlags)) { - if (menu->hSysMenuOwner != 0) + if (menu->hSysMenuOwner) { RECT rc; POPUPMENU* parentMenu; + HWND hwnd; /* Get the parent menu to access*/ - if (!(parentMenu = MENU_GetMenu(menu->hSysMenuOwner))) - return (UINT)-1; + parentMenu = grab_menu_ptr(menu->hSysMenuOwner); + release_menu_ptr(menu); + if (!parentMenu) + return (UINT)-1; + + hwnd = parentMenu->hWnd; + release_menu_ptr(parentMenu); /* Refresh the frame to reflect the change */ - WIN_GetRectangles( parentMenu->hWnd, COORDS_CLIENT, &rc, NULL ); + WIN_GetRectangles( hwnd, COORDS_CLIENT, &rc, NULL ); rc.bottom = 0; - RedrawWindow(parentMenu->hWnd, &rc, 0, RDW_FRAME | RDW_INVALIDATE | RDW_NOCHILDREN); + RedrawWindow(hwnd, &rc, 0, RDW_FRAME | RDW_INVALIDATE | RDW_NOCHILDREN); } } + else + release_menu_ptr(menu); return oldflags; } @@ -3770,21 +3780,37 @@ INT WINAPI GetMenuStringA( LPSTR str, /* [out] outbuffer. If NULL, func returns entry length*/ INT nMaxSiz, /* [in] length of buffer. if 0, func returns entry len*/ UINT wFlags /* [in] MF_ flags */ -) { +) +{ + POPUPMENU *menu; MENUITEM *item; + UINT pos; + INT ret; TRACE("menu=%p item=%04x ptr=%p len=%d flags=%04x\n", hMenu, wItemID, str, nMaxSiz, wFlags ); if (str && nMaxSiz) str[0] = '\0'; - if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) { + + if (!(menu = find_menu_item(hMenu, wItemID, wFlags, &pos))) + { SetLastError( ERROR_MENU_ITEM_NOT_FOUND); return 0; } - if (!item->text) return 0; - if (!str || !nMaxSiz) return WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ); - if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL )) - str[nMaxSiz-1] = 0; + item = &menu->items[pos]; + + if (!item->text) + ret = 0; + else if (!str || !nMaxSiz) + ret = WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ); + else + { + if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL )) + str[nMaxSiz-1] = 0; + ret = strlen(str); + } + release_menu_ptr(menu); + TRACE("returning %s\n", debugstr_a(str)); - return strlen(str); + return ret; } @@ -3794,22 +3820,37 @@ INT WINAPI GetMenuStringA( INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID, LPWSTR str, INT nMaxSiz, UINT wFlags ) { + POPUPMENU *menu; MENUITEM *item; + UINT pos; + INT ret; TRACE("menu=%p item=%04x ptr=%p len=%d flags=%04x\n", hMenu, wItemID, str, nMaxSiz, wFlags ); if (str && nMaxSiz) str[0] = '\0'; - if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) { + + if (!(menu = find_menu_item(hMenu, wItemID, wFlags, &pos))) + { SetLastError( ERROR_MENU_ITEM_NOT_FOUND); return 0; } - if (!str || !nMaxSiz) return item->text ? strlenW(item->text) : 0; - if( !(item->text)) { + item = &menu->items[pos]; + + if (!str || !nMaxSiz) + ret = item->text ? strlenW(item->text) : 0; + else if (!item->text) + { str[0] = 0; - return 0; + ret = 0; + } + else + { + lstrcpynW( str, item->text, nMaxSiz ); + ret = strlenW(str); } - lstrcpynW( str, item->text, nMaxSiz ); + release_menu_ptr(menu); + TRACE("returning %s\n", debugstr_w(str)); - return strlenW(str); + return ret; } @@ -3819,13 +3860,19 @@ INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID, BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, UINT wHilite ) { - LPPOPUPMENU menu; + POPUPMENU *menu; + UINT pos; + TRACE("(%p, %p, %04x, %04x);\n", hWnd, hMenu, wItemID, wHilite); - if (!MENU_FindItem( &hMenu, &wItemID, wHilite )) return FALSE; - if (!(menu = MENU_GetMenu(hMenu))) return FALSE; - if (menu->FocusedItem == wItemID) return TRUE; - MENU_HideSubPopups( hWnd, hMenu, FALSE, 0 ); - MENU_SelectItem( hWnd, hMenu, wItemID, TRUE, 0 ); + + if (!(menu = find_menu_item(hMenu, wItemID, wHilite, &pos))) return FALSE; + + if (menu->FocusedItem != pos) + { + MENU_HideSubPopups( hWnd, menu->obj.handle, FALSE, 0 ); + MENU_SelectItem( hWnd, menu->obj.handle, pos, TRUE, 0 ); + } + release_menu_ptr(menu); return TRUE; } @@ -3835,23 +3882,35 @@ BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, */ UINT WINAPI GetMenuState( HMENU hMenu, UINT wItemID, UINT wFlags ) { + POPUPMENU *menu; + UINT state, pos; MENUITEM *item; + TRACE("(menu=%p, id=%04x, flags=%04x);\n", hMenu, wItemID, wFlags); - if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return -1; + + if (!(menu = find_menu_item(hMenu, wItemID, wFlags, &pos))) + return -1; + + item = &menu->items[pos]; debug_print_menuitem (" item: ", item, ""); if (item->fType & MF_POPUP) { - POPUPMENU *menu = MENU_GetMenu( item->hSubMenu ); - if (!menu) return -1; - else return (menu->nItems << 8) | ((item->fState|item->fType) & 0xff); + POPUPMENU *submenu = grab_menu_ptr(item->hSubMenu); + if (submenu) + state = (submenu->nItems << 8) | ((item->fState | item->fType) & 0xff); + else + state = -1; + release_menu_ptr(submenu); } else { /* We used to (from way back then) mask the result to 0xff. */ /* I don't know why and it seems wrong as the documented */ /* return flag MF_SEPARATOR is outside that mask. */ - return (item->fType | item->fState); + state = (item->fType | item->fState); } + release_menu_ptr(menu); + return state; } @@ -3877,12 +3936,15 @@ INT WINAPI GetMenuItemCount( HMENU hMenu ) */ UINT WINAPI GetMenuItemID( HMENU hMenu, INT nPos ) { - MENUITEM * lpmi; + POPUPMENU *menu; + UINT id, pos; - if (!(lpmi = MENU_FindItem(&hMenu,(UINT*)&nPos,MF_BYPOSITION))) return -1; - if (lpmi->fType & MF_POPUP) return -1; - return lpmi->wID; + if (!(menu = find_menu_item(hMenu, nPos, MF_BYPOSITION, &pos))) + return -1; + id = menu->items[pos].fType & MF_POPUP ? -1 : menu->items[pos].wID; + release_menu_ptr(menu); + return id; } @@ -3935,8 +3997,11 @@ static void MENU_mnu2mnuii( UINT flags, UINT_PTR id, LPCWSTR str, BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, UINT_PTR id, LPCWSTR str ) { - MENUITEM *item; MENUITEMINFOW mii; + POPUPMENU *menu; + MENUITEM *item; + UINT newpos; + BOOL ret; if (IS_STRING_ITEM(flags) && str) TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %s\n", @@ -3944,16 +4009,20 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, else TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %p (not a string)\n", hMenu, pos, flags, id, str ); - if (!(item = MENU_InsertItem( hMenu, pos, flags ))) return FALSE; + if (!(menu = insert_menu_item(hMenu, pos, flags, &newpos))) + return FALSE; + MENU_mnu2mnuii( flags, id, str, &mii); - if (!(SetMenuItemInfo_common( item, &mii, TRUE))) - { + + item = &menu->items[newpos]; + ret = SetMenuItemInfo_common( item, &mii, TRUE); + if (ret) + item->hCheckBit = item->hUnCheckBit = 0; + else RemoveMenu( hMenu, pos, flags ); - return FALSE; - } + release_menu_ptr(menu); - item->hCheckBit = item->hUnCheckBit = 0; - return TRUE; + return ret; } @@ -4004,18 +4073,18 @@ BOOL WINAPI AppendMenuW( HMENU hMenu, UINT flags, /********************************************************************** * RemoveMenu (USER32.@) */ -BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags ) +BOOL WINAPI RemoveMenu( HMENU hMenu, UINT id, UINT flags ) { - LPPOPUPMENU menu; - MENUITEM *item; + POPUPMENU *menu; + UINT pos; - TRACE("(menu=%p pos=%04x flags=%04x)\n",hMenu, nPos, wFlags); - if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE; - if (!(menu = MENU_GetMenu(hMenu))) return FALSE; + TRACE("(menu=%p id=%#x flags=%04x)\n", hMenu, id, flags); - /* Remove item */ + if (!(menu = find_menu_item(hMenu, id, flags, &pos))) + return FALSE; - MENU_FreeItemData( item ); + /* Remove item */ + MENU_FreeItemData( &menu->items[pos] ); if (--menu->nItems == 0) { @@ -4024,17 +4093,19 @@ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags ) } else { - MENUITEM *new_items; - while(nPos < menu->nItems) + MENUITEM *new_items, *item = &menu->items[pos]; + + while (pos < menu->nItems) { *item = *(item+1); item++; - nPos++; + pos++; } - new_items = HeapReAlloc( GetProcessHeap(), 0, menu->items, - menu->nItems * sizeof(MENUITEM) ); + new_items = HeapReAlloc( GetProcessHeap(), 0, menu->items, menu->nItems * sizeof(MENUITEM) ); if (new_items) menu->items = new_items; } + release_menu_ptr(menu); + return TRUE; } @@ -4042,13 +4113,19 @@ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags ) /********************************************************************** * DeleteMenu (USER32.@) */ -BOOL WINAPI DeleteMenu( HMENU hMenu, UINT nPos, UINT wFlags ) +BOOL WINAPI DeleteMenu( HMENU hMenu, UINT id, UINT flags ) { - MENUITEM *item = MENU_FindItem( &hMenu, &nPos, wFlags ); - if (!item) return FALSE; - if (item->fType & MF_POPUP) DestroyMenu( item->hSubMenu ); - /* nPos is now the position of the item */ - RemoveMenu( hMenu, nPos, wFlags | MF_BYPOSITION ); + POPUPMENU *menu; + UINT pos; + + if (!(menu = find_menu_item(hMenu, id, flags, &pos))) + return FALSE; + + if (menu->items[pos].fType & MF_POPUP) + DestroyMenu(menu->items[pos].hSubMenu); + + RemoveMenu(menu->obj.handle, pos, flags | MF_BYPOSITION); + release_menu_ptr(menu); return TRUE; } @@ -4059,23 +4136,27 @@ BOOL WINAPI DeleteMenu( HMENU hMenu, UINT nPos, UINT wFlags ) BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags, UINT_PTR id, LPCWSTR str ) { - MENUITEM *item; MENUITEMINFOW mii; + POPUPMENU *menu; + UINT item_pos; + BOOL ret; if (IS_STRING_ITEM(flags)) TRACE("%p %d %04x %04lx %s\n", hMenu, pos, flags, id, debugstr_w(str) ); else TRACE("%p %d %04x %04lx %p\n", hMenu, pos, flags, id, str ); - if (!(item = MENU_FindItem( &hMenu, &pos, flags ))) + if (!(menu = find_menu_item(hMenu, pos, flags, &item_pos))) { /* workaround for Word 95: pretend that SC_TASKLIST item exists */ if (pos == SC_TASKLIST && !(flags & MF_BYPOSITION)) return TRUE; return FALSE; } - MENU_GetMenu(hMenu)->Height = 0; /* force size recalculate */ + menu->Height = 0; /* force size recalculate */ MENU_mnu2mnuii( flags, id, str, &mii); - return SetMenuItemInfo_common( item, &mii, TRUE); + ret = SetMenuItemInfo_common(&menu->items[item_pos], &mii, TRUE); + release_menu_ptr(menu); + return ret; } @@ -4134,20 +4215,26 @@ DWORD WINAPI GetMenuCheckMarkDimensions(void) BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags, HBITMAP hNewUnCheck, HBITMAP hNewCheck) { + POPUPMENU *menu; MENUITEM *item; + UINT pos; - if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE; + if (!(menu = find_menu_item(hMenu, nPos, wFlags, &pos))) + return FALSE; + item = &menu->items[pos]; if (!hNewCheck && !hNewUnCheck) { - item->fState &= ~MF_USECHECKBITMAPS; + item->fState &= ~MF_USECHECKBITMAPS; } else /* Install new bitmaps */ { - item->hCheckBit = hNewCheck; - item->hUnCheckBit = hNewUnCheck; - item->fState |= MF_USECHECKBITMAPS; + item->hCheckBit = hNewCheck; + item->hUnCheckBit = hNewUnCheck; + item->fState |= MF_USECHECKBITMAPS; } + release_menu_ptr(menu); + return TRUE; } @@ -4418,11 +4505,20 @@ BOOL WINAPI SetMenu( HWND hWnd, HMENU hMenu ) */ HMENU WINAPI GetSubMenu( HMENU hMenu, INT nPos ) { - MENUITEM * lpmi; + POPUPMENU *menu; + HMENU submenu; + UINT pos; + + if (!(menu = find_menu_item(hMenu, nPos, MF_BYPOSITION, &pos))) + return 0; - if (!(lpmi = MENU_FindItem(&hMenu,(UINT*)&nPos,MF_BYPOSITION))) return 0; - if (!(lpmi->fType & MF_POPUP)) return 0; - return lpmi->hSubMenu; + if (menu->items[pos].fType & MF_POPUP) + submenu = menu->items[pos].hSubMenu; + else + submenu = 0; + + release_menu_ptr(menu); + return submenu; } @@ -4631,31 +4727,39 @@ BOOL WINAPI IsMenu(HMENU hmenu) * GetMenuItemInfo_common */ -static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, +static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT id, BOOL bypos, LPMENUITEMINFOW lpmii, BOOL unicode) { - MENUITEM *menu = MENU_FindItem (&hmenu, &item, bypos ? MF_BYPOSITION : 0); + POPUPMENU *menu; + MENUITEM *item; + UINT pos; - debug_print_menuitem("GetMenuItemInfo_common: ", menu, ""); + menu = find_menu_item(hmenu, id, bypos ? MF_BYPOSITION : 0, &pos); - if (!menu) { + item = menu ? &menu->items[pos] : NULL; + + debug_print_menuitem("GetMenuItemInfo_common: ", item, ""); + + if (!menu) + { SetLastError( ERROR_MENU_ITEM_NOT_FOUND); return FALSE; } if( lpmii->fMask & MIIM_TYPE) { if( lpmii->fMask & ( MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) { + release_menu_ptr(menu); WARN("invalid combination of fMask bits used\n"); /* this does not happen on Win9x/ME */ SetLastError( ERROR_INVALID_PARAMETER); return FALSE; } - lpmii->fType = menu->fType & MENUITEMINFO_TYPE_MASK; - if (menu->hbmpItem && !IS_MAGIC_BITMAP(menu->hbmpItem)) + lpmii->fType = item->fType & MENUITEMINFO_TYPE_MASK; + if (item->hbmpItem && !IS_MAGIC_BITMAP(item->hbmpItem)) lpmii->fType |= MFT_BITMAP; - lpmii->hbmpItem = menu->hbmpItem; /* not on Win9x/ME */ + lpmii->hbmpItem = item->hbmpItem; /* not on Win9x/ME */ if( lpmii->fType & MFT_BITMAP) { - lpmii->dwTypeData = (LPWSTR) menu->hbmpItem; + lpmii->dwTypeData = (LPWSTR) item->hbmpItem; lpmii->cch = 0; } else if( lpmii->fType & (MFT_OWNERDRAW | MFT_SEPARATOR)) { /* this does not happen on Win9x/ME */ @@ -4666,7 +4770,7 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, /* copy the text string */ if ((lpmii->fMask & (MIIM_TYPE|MIIM_STRING))) { - if( !menu->text ) { + if (!item->text) { if(lpmii->dwTypeData && lpmii->cch) { if( unicode) *((WCHAR *)lpmii->dwTypeData) = 0; @@ -4678,16 +4782,16 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, int len; if (unicode) { - len = strlenW(menu->text); + len = strlenW(item->text); if(lpmii->dwTypeData && lpmii->cch) - lstrcpynW(lpmii->dwTypeData, menu->text, lpmii->cch); + lstrcpynW(lpmii->dwTypeData, item->text, lpmii->cch); } else { - len = WideCharToMultiByte( CP_ACP, 0, menu->text, -1, NULL, + len = WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ) - 1; if(lpmii->dwTypeData && lpmii->cch) - if (!WideCharToMultiByte( CP_ACP, 0, menu->text, -1, + if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, (LPSTR)lpmii->dwTypeData, lpmii->cch, NULL, NULL )) ((LPSTR)lpmii->dwTypeData)[lpmii->cch - 1] = 0; } @@ -4706,19 +4810,19 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, } if (lpmii->fMask & MIIM_FTYPE) - lpmii->fType = menu->fType & MENUITEMINFO_TYPE_MASK; + lpmii->fType = item->fType & MENUITEMINFO_TYPE_MASK; if (lpmii->fMask & MIIM_BITMAP) - lpmii->hbmpItem = menu->hbmpItem; + lpmii->hbmpItem = item->hbmpItem; if (lpmii->fMask & MIIM_STATE) - lpmii->fState = menu->fState & MENUITEMINFO_STATE_MASK; + lpmii->fState = item->fState & MENUITEMINFO_STATE_MASK; if (lpmii->fMask & MIIM_ID) - lpmii->wID = menu->wID; + lpmii->wID = item->wID; if (lpmii->fMask & MIIM_SUBMENU) - lpmii->hSubMenu = menu->hSubMenu; + lpmii->hSubMenu = item->hSubMenu; else { /* hSubMenu is always cleared * (not on Win9x/ME ) */ @@ -4726,13 +4830,14 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, } if (lpmii->fMask & MIIM_CHECKMARKS) { - lpmii->hbmpChecked = menu->hCheckBit; - lpmii->hbmpUnchecked = menu->hUnCheckBit; + lpmii->hbmpChecked = item->hCheckBit; + lpmii->hbmpUnchecked = item->hUnCheckBit; } if (lpmii->fMask & MIIM_DATA) - lpmii->dwItemData = menu->dwItemData; + lpmii->dwItemData = item->dwItemData; - return TRUE; + release_menu_ptr(menu); + return TRUE; } /********************************************************************** @@ -4949,20 +5054,24 @@ static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOA *lpmii) { - MENUITEM *menuitem; MENUITEMINFOW mii; + POPUPMENU *menu; + UINT pos; + BOOL ret; TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); if (!MENU_NormalizeMenuItemInfoStruct( (const MENUITEMINFOW *)lpmii, &mii )) return FALSE; - if (!(menuitem = MENU_FindItem( &hmenu, &item, bypos? MF_BYPOSITION : 0 ))) + if (!(menu = find_menu_item(hmenu, item, bypos ? MF_BYPOSITION : 0, &pos))) { /* workaround for Word 95: pretend that SC_TASKLIST item exists */ if (item == SC_TASKLIST && !bypos) return TRUE; return FALSE; } - return SetMenuItemInfo_common( menuitem, &mii, FALSE ); + ret = SetMenuItemInfo_common(&menu->items[pos], &mii, FALSE); + release_menu_ptr(menu); + return ret; } /********************************************************************** @@ -4971,19 +5080,25 @@ BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOW *lpmii) { - MENUITEM *menuitem; MENUITEMINFOW mii; + POPUPMENU *menu; + BOOL ret; + UINT pos; TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); if (!MENU_NormalizeMenuItemInfoStruct( lpmii, &mii )) return FALSE; - if (!(menuitem = MENU_FindItem( &hmenu, &item, bypos? MF_BYPOSITION : 0 ))) + + if (!(menu = find_menu_item(hmenu, item, bypos ? MF_BYPOSITION : 0, &pos))) { /* workaround for Word 95: pretend that SC_TASKLIST item exists */ if (item == SC_TASKLIST && !bypos) return TRUE; return FALSE; } - return SetMenuItemInfo_common( menuitem, &mii, TRUE ); + + ret = SetMenuItemInfo_common(&menu->items[pos], &mii, TRUE); + release_menu_ptr(menu); + return ret; } static BOOL set_menu_default_item(POPUPMENU *menu, UINT uItem, UINT bypos) @@ -5090,15 +5205,21 @@ UINT WINAPI GetMenuDefaultItem(HMENU hmenu, UINT bypos, UINT flags) BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, const MENUITEMINFOA *lpmii) { - MENUITEM *item; MENUITEMINFOW mii; + POPUPMENU *menu; + UINT pos; + BOOL ret; TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); if (!MENU_NormalizeMenuItemInfoStruct( (const MENUITEMINFOW *)lpmii, &mii )) return FALSE; - item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); - return SetMenuItemInfo_common(item, &mii, FALSE); + if (!(menu = insert_menu_item(hMenu, uItem, bypos ? MF_BYPOSITION : 0, &pos))) + return FALSE; + + ret = SetMenuItemInfo_common(&menu->items[pos], &mii, FALSE); + release_menu_ptr(menu); + return ret; } @@ -5108,64 +5229,77 @@ BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, const MENUITEMINFOW *lpmii) { - MENUITEM *item; MENUITEMINFOW mii; + POPUPMENU *menu; + UINT pos; + BOOL ret; TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); if (!MENU_NormalizeMenuItemInfoStruct( lpmii, &mii )) return FALSE; - item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); - return SetMenuItemInfo_common(item, &mii, TRUE); + if (!(menu = insert_menu_item(hMenu, uItem, bypos ? MF_BYPOSITION : 0, &pos))) + return FALSE; + + ret = SetMenuItemInfo_common(&menu->items[pos], &mii, TRUE); + release_menu_ptr(menu); + return ret; } /********************************************************************** * CheckMenuRadioItem (USER32.@) */ -BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, - UINT first, UINT last, UINT check, - UINT bypos) +BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, + UINT check, UINT flags) { + POPUPMENU *first_menu = NULL, *check_menu = NULL; + UINT i, first_pos, check_pos; BOOL done = FALSE; - UINT i; - MENUITEM *mi_first = NULL, *mi_check; - HMENU m_first, m_check; for (i = first; i <= last; i++) { - UINT pos = i; + MENUITEM *item; - if (!mi_first) + if (!first_menu) { - m_first = hMenu; - mi_first = MENU_FindItem(&m_first, &pos, bypos); - if (!mi_first) continue; - mi_check = mi_first; - m_check = m_first; + if (!(first_menu = find_menu_item(hMenu, i, flags, &first_pos))) + continue; + + check_pos = first_pos; + check_menu = grab_menu_ptr(first_menu->obj.handle); } else { - m_check = hMenu; - mi_check = MENU_FindItem(&m_check, &pos, bypos); - if (!mi_check) continue; + if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) + continue; } - if (m_first != m_check) continue; - if (mi_check->fType == MFT_SEPARATOR) continue; - - if (i == check) + if (first_menu != check_menu) { - mi_check->fType |= MFT_RADIOCHECK; - mi_check->fState |= MFS_CHECKED; - done = TRUE; + release_menu_ptr(check_menu); + continue; } - else + + item = &check_menu->items[check_pos]; + if (item->fType != MFT_SEPARATOR) { - /* MSDN is wrong, Windows does not remove MFT_RADIOCHECK */ - mi_check->fState &= ~MFS_CHECKED; + if (i == check) + { + item->fType |= MFT_RADIOCHECK; + item->fState |= MFS_CHECKED; + done = TRUE; + } + else + { + /* MSDN is wrong, Windows does not remove MFT_RADIOCHECK */ + item->fState &= ~MFS_CHECKED; + } } + + release_menu_ptr(check_menu); } + release_menu_ptr(first_menu); return done; } @@ -5181,27 +5315,30 @@ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, */ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) { - POPUPMENU *menu; - MENUITEM *item; - - TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); + POPUPMENU *menu; + UINT pos; - item = MENU_FindItem (&hMenu, &uItem, MF_BYPOSITION); - if ((rect == NULL) || (item == NULL)) - return FALSE; + TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); - menu = MENU_GetMenu(hMenu); - if (!menu) return FALSE; + if (!rect) + return FALSE; - if (!hwnd) hwnd = menu->hWnd; - if (!hwnd) return FALSE; + if (!(menu = find_menu_item(hMenu, uItem, MF_BYPOSITION, &pos))) + return FALSE; - *rect = item->rect; + if (!hwnd) hwnd = menu->hWnd; + if (!hwnd) + { + release_menu_ptr(menu); + return FALSE; + } - OffsetRect(rect, menu->items_rect.left, menu->items_rect.top); - MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + *rect = menu->items[pos].rect; + OffsetRect(rect, menu->items_rect.left, menu->items_rect.top); + release_menu_ptr(menu); - return TRUE; + MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + return TRUE; } /********************************************************************** @@ -5415,16 +5552,18 @@ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARA { HMENU hMenu, hSubMenu, hSysMenu; UINT uSysStat = (UINT)-1, uStat = (UINT)-1, nPos; + POPUPMENU *menu; hMenu = (GetWindowLongW( hWnd, GWL_STYLE ) & WS_CHILD) ? 0 : GetMenu(hWnd); hSysMenu = get_win_sys_menu( hWnd ); /* find menu item and ask application to initialize it */ /* 1. in the system menu */ - hSubMenu = hSysMenu; - nPos = cmd; - if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) + if ((menu = find_menu_item(hSysMenu, cmd, MF_BYCOMMAND, NULL))) { + hSubMenu = menu->obj.handle; + release_menu_ptr(menu); + if (GetCapture()) mesg = 2; if (!IsWindowEnabled(hWnd)) @@ -5443,10 +5582,11 @@ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARA } else /* 2. in the window's menu */ { - hSubMenu = hMenu; - nPos = cmd; - if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) + if ((menu = find_menu_item(hMenu, cmd, MF_BYCOMMAND, NULL))) { + hSubMenu = menu->obj.handle; + release_menu_ptr(menu); + if (GetCapture()) mesg = 2; if (!IsWindowEnabled(hWnd)) -- 2.17.0

2 1

[PATCH] po: Update Russian translation.
by Nikolay Sivov 10 May '18

10 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/po/ru.po b/po/ru.po index ac652dfbb7..146b8dda2c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ 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-04-10 10:53+0300\n" +"PO-Revision-Date: 2018-05-10 08:12+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.0.7\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -8498,10 +8498,8 @@ msgid "&Browse..." msgstr "&Обзор..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Тип файла" +msgstr "Тип файла:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8512,16 +8510,12 @@ msgid "Size:" msgstr "Размер:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Дата создания" +msgstr "Дата создания:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Свойства:" +msgstr "Атрибуты:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8532,28 +8526,20 @@ msgid "&Archive" msgstr "&Архивный" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Открыть:" +msgstr "Открывать в:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "Изменить &значок..." +msgstr "&Изменить..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Изменён" +msgstr "Изменён:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Последнее изменение:" +msgstr "Открыт:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" -- 2.17.0

1 0

[PATCH] ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
by Alistair Leslie-Hughes 10 May '18

10 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure.ac | 1 + dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in | 1 + .../ext-ms-win-uxtheme-themes-l1-1-0.spec | 24 ++++++++++++++++++++++ tools/make_specfiles | 4 ++++ 4 files changed, 30 insertions(+) create mode 100644 dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in create mode 100644 dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec diff --git a/configure.ac b/configure.ac index 54c31d8..3ffcd3e 100644 --- a/configure.ac +++ b/configure.ac @@ -3280,6 +3280,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) WINE_CONFIG_MAKEFILE(dlls/fltlib) diff --git a/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in new file mode 100644 index 0000000..576b6f6 --- /dev/null +++ b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-uxtheme-themes-l1-1-0.dll diff --git a/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec new file mode 100644 index 0000000..0a96983 --- /dev/null +++ b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec @@ -0,0 +1,24 @@ +@ stdcall CloseThemeData(ptr) uxtheme.CloseThemeData +@ stdcall DrawThemeBackground(ptr ptr long long ptr ptr) uxtheme.DrawThemeBackground +@ stub GetColorFromPreference +@ stub GetImmersiveColorFromColorSetEx +@ stub GetImmersiveUserColorSetPreference +@ stub GetThemeAnimationProperty +@ stub GetThemeAnimationTransform +@ stdcall GetThemeBackgroundExtent(ptr ptr long long ptr ptr) uxtheme.GetThemeBackgroundExtent +@ stub GetThemeBitmap +@ stdcall GetThemeColor(ptr long long long ptr) uxtheme.GetThemeColor +@ stdcall GetThemeEnumValue(ptr long long long ptr) uxtheme.GetThemeEnumValue +@ stdcall GetThemeFont(ptr ptr long long long ptr) uxtheme.GetThemeFont +@ stdcall GetThemeInt(ptr long long long ptr) uxtheme.GetThemeInt +@ stdcall GetThemeMargins(ptr ptr long long long ptr ptr) uxtheme.GetThemeMargins +@ stdcall GetThemePartSize(ptr ptr long long ptr long ptr) uxtheme.GetThemePartSize +@ stdcall GetThemePosition(ptr long long long ptr) uxtheme.GetThemePosition +@ stub GetThemeTimingFunction +@ stub GetUserColorPreference +@ stdcall IsAppThemed() uxtheme.IsAppThemed +@ stdcall IsThemeActive() uxtheme.IsThemeActive +@ stdcall IsThemePartDefined(ptr long long) uxtheme.IsThemePartDefined +@ stdcall OpenThemeData(ptr wstr) uxtheme.OpenThemeData +@ stdcall OpenThemeDataEx(ptr wstr long) uxtheme.OpenThemeDataEx +@ stdcall SetWindowTheme(ptr wstr wstr) uxtheme.SetWindowTheme diff --git a/tools/make_specfiles b/tools/make_specfiles index 6fe79f6..4faf665 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -443,6 +443,10 @@ my @dll_groups = "api-ms-win-core-winrt-string-l1-1-0", ], [ + "uxtheme", + "ext-ms-win-uxtheme-themes-l1-1-0", + ], + [ "bthprops.cpl", "irprops.cpl", ], -- 1.9.1

1 0

[PATCH 1/4] include: Add wmcodecdsp.idl and CMP3DecMediaObject.
by Zebediah Figura 09 May '18

09 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/Makefile.in | 1 + include/wmcodecdsp.idl | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 include/wmcodecdsp.idl diff --git a/include/Makefile.in b/include/Makefile.in index 22262ac..b598fd8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -702,6 +702,7 @@ SOURCES = \ winuser.rh \ winver.h \ wlanapi.h \ + wmcodecdsp.idl \ wmdrmsdk.idl \ wmistr.h \ wmium.h \ diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl new file mode 100644 index 0000000..dc6b9ee --- /dev/null +++ b/include/wmcodecdsp.idl @@ -0,0 +1,26 @@ +/* + * Copyright 2018 Zebediah Figura + * + * 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 + */ + +import "mediaobj.idl"; +import "strmif.idl"; + +[ + threading(both), + uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) +] +coclass CMP3DecMediaObject {} -- 2.7.4

1 3

[PATCH] advapi32/tests: Free subkey.
by Daniel Lehman 09 May '18

09 May '18

1 0

wine-3.0.1-rc3 Available
by Michael Stefaniuc 09 May '18

09 May '18

Hello guys, I have pushed wine-3.0.1-rc3 (with tag) to https://github.com/mstefani/wine-stable/tree/oldstable https://static-winehq.193b.starter-ca-central-1.openshiftapps.com/stable/ Changes since rc2: - Added some translation commits. All but the Polish translation updates are for the commit "kernel32: Add message resource for TRUST_E_NOSIGNATURE." bye michael

1 0

[PATCH] arm64: Use __builtin_ms_va_list and __attribute__((ms_abi)) on arm64
by Martin Storsjo 09 May '18

09 May '18

Windows uses a different ABI for va_list on arm64 just like on x86_64. On x86_64, the calling convention for windows functions is completely different from the one on other platforms. On arm64, they're mostly the same, with the only exception being variadic functions (where all float arguments are passed in integer registers, since the va_list is a single pointer). Any functions using __builtin_ms_va_start need to be decorated with __attribute__((ms_abi)). Add a check in configure for the support of __builtin_ms_va_list (both features appared in clang at the same time, in the 5.0 release). This fixes running binaries that use e.g. printf style functions (e.g. midl.exe from the windows 10 sdk), fixing https://bugs.winehq.org/show_bug.cgi?id=38886. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- A new enough version of clang is available in the latest stable version of the Android NDK, r17. A new enough version is also available in Xcode 9.3, and there's finally a second stable release of vanilla Clang (6.0.0) that also contains support for this. This effectively disables building for arm64 with gcc, though, since only clang supports this calling convention. I guess it would be preferrable to still be able to build it even if the compiler doesn't support the ms_abi attribute and __builtin_ms_va_start (with a loud configure warning saying that it isn't ABI compatible), but as far as I can see, the headers that decide whether to use them or not don't include config.h (and probably aren't allowed to). Querying it at build time with __has_attribute doesn't work, since this check signals that e.g. the ms_abi attribute is supported, even if building for an architecture where the attribute isn't supported. (It's currently supported on x86_64 and aarch64.) --- configure.ac | 7 +++++++ include/msvcrt/crtdefs.h | 6 +++++- include/windef.h | 6 +++++- include/wine/test.h | 4 ++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 54c31d8..b4a8ef0 100644 --- a/configure.ac +++ b/configure.ac @@ -205,6 +205,13 @@ case $host in CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi") ;; + aarch64*) + AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])]) + ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index a9edef5..0c0b087 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -62,6 +62,8 @@ # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -82,13 +84,15 @@ # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __cdecl __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __cdecl __attribute__((ms_abi)) # elif !defined(_MSC_VER) # define __cdecl # endif #endif /* __cdecl */ #ifndef __ms_va_list -# if defined(__x86_64__) && defined (__GNUC__) +# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/windef.h b/include/windef.h index 40028f3..8e8a08a 100644 --- a/include/windef.h +++ b/include/windef.h @@ -71,6 +71,8 @@ extern "C" { # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -91,13 +93,15 @@ extern "C" { # endif # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __cdecl __attribute__((pcs("aapcs-vfp"))) +# elif defined(__aarch64__) && defined (__GNUC__) +# define __cdecl __attribute__((ms_abi)) # elif !defined(_MSC_VER) # define __cdecl # endif #endif /* __cdecl */ #ifndef __ms_va_list -# if defined(__x86_64__) && defined (__GNUC__) +# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/wine/test.h b/include/wine/test.h index 21e2ac7..e3e4bcf 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -90,7 +90,7 @@ static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) #define START_TEST(name) void func_##name(void) #endif -#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) #define __winetest_cdecl __cdecl #define __winetest_va_list __builtin_ms_va_list #else @@ -181,7 +181,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRI #include <stdio.h> #include <excpt.h> -#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) # define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __winetest_va_end(list) __builtin_ms_va_end(list) #else -- 2.7.4

1 0

[PATCH]: po: Update Lithuanian translation
by Aurimas Fišeras 09 May '18

09 May '18

1 0

[PATCH] msvcrt: Omit pointer coding functions from SOs for newer MSVC versions
by Alex Henrie 09 May '18

09 May '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/misc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c197d69dd2..d760e171bd 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -426,7 +426,7 @@ int CDECL MSVCRT__resetstkoflw(void) return VirtualProtect(&stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, &oldprot); } -#if _MSVCR_VER>=80 +#if _MSVCR_VER>=80 && _MSVCR_VER<=90 /********************************************************************* * _decode_pointer (MSVCR80.@) @@ -444,6 +444,9 @@ void * CDECL MSVCRT_encode_pointer(void * ptr) return EncodePointer(ptr); } +#endif /* _MSVCR_VER>=80 && _MSVCR_VER<=90 */ + +#if _MSVCR_VER>=80 && _MSVCR_VER<=100 /********************************************************************* * _encoded_null (MSVCR80.@) */ @@ -453,8 +456,7 @@ void * CDECL _encoded_null(void) return EncodePointer(NULL); } - -#endif /* _MSVCR_VER>=80 */ +#endif #if _MSVCR_VER>=70 /********************************************************************* -- 2.17.0

2 1

[PATCH v4] msvcp: Add a stub of _Concurrent_vector_base_v4.
by Piotr Caban 09 May '18

09 May '18

From: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v4: - forward to msvcp120 in concrt140 - white-space changes - fixed class structure definition dlls/concrt140/concrt140.spec | 48 ++++++------- dlls/msvcp100/msvcp100.spec | 48 ++++++------- dlls/msvcp110/msvcp110.spec | 72 +++++++++---------- dlls/msvcp120/msvcp120.spec | 72 +++++++++---------- dlls/msvcp120_app/msvcp120_app.spec | 72 +++++++++---------- dlls/msvcp90/misc.c | 134 ++++++++++++++++++++++++++++++++++++ 6 files changed, 290 insertions(+), 156 deletions(-)

1 0

[PATCH v2] msvcr110: Try SNAME when matching locale.
by Piotr Caban 09 May '18

09 May '18

Based on patch by Daniel Lehman. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr110/tests/msvcr110.c | 8 +- dlls/msvcrt/locale.c | 197 ++++++++++++++++++++++++++++++----------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 5 +- 4 files changed, 154 insertions(+), 58 deletions(-)

1 0

[PATCH 3/6] urlmon/tests: Added more protocol COM ggregation tests.
by Jacek Caban 09 May '18

09 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/protocol.c | 118 ++++++++++++++++++++++++++++++------------- 1 file changed, 84 insertions(+), 34 deletions(-)

2 1

[PATCH 6/6] urlmon: Query for IWinInet[Http]Info on BindProtocol instead of protocol handler directly.
by Jacek Caban 09 May '18

09 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/binding.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-)

1 0

[PATCH 5/6] urlmon: Use COM aggregation for IWinInetInfo and IWinInetHttpInfo interfaces in BindProtocol.
by Jacek Caban 09 May '18

09 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/bindprot.c | 74 ----------------------------------------------- dlls/urlmon/urlmon_main.h | 1 - 2 files changed, 75 deletions(-)

1 0

[PATCH 4/6] urlmon: Support querying interfaces from aggregated handlers in BindProtocol.
by Jacek Caban 09 May '18

09 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/bindprot.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 2/6] urlmon: Use COM aggregation for urlmon protocols in BindProtocol::StartEx.
by Jacek Caban 09 May '18

09 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/binding.c | 2 +- dlls/urlmon/bindprot.c | 30 ++++++++++-------------------- dlls/urlmon/session.c | 2 +- dlls/urlmon/tests/url.c | 4 ++-- dlls/urlmon/urlmon_main.h | 3 +-- 5 files changed, 15 insertions(+), 26 deletions(-)

1 0

[PATCH 1/6] urlmon: Use protocol handler's IUnknown to query other interfaces in BindProtocol.
by Jacek Caban 09 May '18

09 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/bindprot.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)

1 0

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