May 2018 - Wine-Devel - list.winehq.org

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

May 16, 2018

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 May 16, 2018

May 16, 2018

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 May 16, 2018

May 16, 2018

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 May 16, 2018

May 16, 2018

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 May 16, 2018

May 16, 2018

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 May 16, 2018

May 16, 2018

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 May 16, 2018

May 16, 2018

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 May 16, 2018

May 16, 2018

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 May 16, 2018

May 16, 2018

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 May 16, 2018

May 16, 2018

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