March 2020 - Wine-devel - list.winehq.org

[PATCH v2 1/2] gdiplus/tests: Add tests for multi-figure lines to test_widen_cap.
by Jeff Smith 26 Mar '20

26 Mar '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/tests/graphicspath.c | 78 ++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 99f25930ca..91c2406bf1 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1375,6 +1375,52 @@ static path_test_t widenline_capsquareanchor_thin_path[] = { {51.414211, 11.414213, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ }; +static path_test_t widenline_capsquareanchor_dashed_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {35.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {35.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {45.0, 5.0, PathPointTypeStart, 0, 1}, /*4*/ + {50.0, 5.0, PathPointTypeLine, 0, 1}, /*5*/ + {50.0, 15.0, PathPointTypeLine, 0, 1}, /*6*/ + {45.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*7*/ + {12.071068, 2.928932, PathPointTypeStart, 0, 1}, /*8*/ + {12.071068, 17.071066, PathPointTypeLine, 0, 1}, /*9*/ + {-2.071068, 17.071066, PathPointTypeLine, 0, 1}, /*10*/ + {-2.071068, 2.928932, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*11*/ + {42.928928, 17.071068, PathPointTypeStart, 0, 0}, /*12*/ + {42.928928, 2.928932, PathPointTypeLine, 0, 0}, /*13*/ + {57.071068, 2.928932, PathPointTypeLine, 0, 0}, /*14*/ + {57.071068, 17.071068, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*15*/ + }; + +static path_test_t widenline_capsquareanchor_multifigure_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {25.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {25.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {30.0, 5.0, PathPointTypeStart, 0, 1}, /*4*/ + {50.0, 5.0, PathPointTypeLine, 0, 1}, /*5*/ + {50.0, 15.0, PathPointTypeLine, 0, 1}, /*6*/ + {30.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*7*/ + {12.071068, 2.928932, PathPointTypeStart, 0, 1}, /*8*/ + {12.071068, 17.071066, PathPointTypeLine, 0, 1}, /*9*/ + {-2.071068, 17.071066, PathPointTypeLine, 0, 1}, /*10*/ + {-2.071068, 2.928932, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*11*/ + {17.928930, 17.071068, PathPointTypeStart, 0, 1}, /*12*/ + {17.928930, 2.928932, PathPointTypeLine, 0, 1}, /*13*/ + {32.071068, 2.928932, PathPointTypeLine, 0, 1}, /*14*/ + {32.071068, 17.071068, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*15*/ + {37.071068, 2.928932, PathPointTypeStart, 0, 0}, /*16*/ + {37.071068, 17.071066, PathPointTypeLine, 0, 0}, /*17*/ + {22.928930, 17.071066, PathPointTypeLine, 0, 0}, /*18*/ + {22.928930, 2.928932, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*19*/ + {42.928928, 17.071068, PathPointTypeStart, 0, 0}, /*20*/ + {42.928928, 2.928932, PathPointTypeLine, 0, 0}, /*21*/ + {57.071068, 2.928932, PathPointTypeLine, 0, 0}, /*22*/ + {57.071068, 17.071068, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*23*/ + }; + static void test_widen_cap(void) { struct @@ -1383,6 +1429,7 @@ static void test_widen_cap(void) REAL line_width; const path_test_t *expected; INT expected_size; + BOOL dashed; BOOL todo_size; } caps[] = @@ -1404,9 +1451,11 @@ static void test_widen_cap(void) { LineCapDiamondAnchor, 10.0, widenline_capdiamondanchor_path, ARRAY_SIZE(widenline_capdiamondanchor_path) }, { LineCapArrowAnchor, 10.0, widenline_caparrowanchor_path, - ARRAY_SIZE(widenline_caparrowanchor_path), TRUE }, + ARRAY_SIZE(widenline_caparrowanchor_path), FALSE, TRUE }, { LineCapSquareAnchor, 0.0, widenline_capsquareanchor_thin_path, - ARRAY_SIZE(widenline_capsquareanchor_thin_path), TRUE }, + ARRAY_SIZE(widenline_capsquareanchor_thin_path), FALSE, TRUE }, + { LineCapSquareAnchor, 10.0, widenline_capsquareanchor_dashed_path, + ARRAY_SIZE(widenline_capsquareanchor_dashed_path), TRUE }, }; GpStatus status; GpPath *path; @@ -1420,6 +1469,11 @@ static void test_widen_cap(void) { status = GdipCreatePen1(0xffffffff, caps[i].line_width, UnitPixel, &pen); expect(Ok, status); + if (caps[i].dashed) + { + status = GdipSetPenDashStyle(pen, DashStyleDash); + expect(Ok, status); + } status = GdipResetPath(path); expect(Ok, status); @@ -1437,6 +1491,26 @@ static void test_widen_cap(void) GdipDeletePen(pen); } + status = GdipCreatePen1(0xffffffff, 10.0, UnitPixel, &pen); + expect(Ok, status); + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 25.0, 10.0); + expect(Ok, status); + status = GdipStartPathFigure(path); + expect(Ok, status); + status = GdipAddPathLine(path, 30.0, 10.0, 50.0, 10.0); + expect(Ok, status); + status = GdipSetPenStartCap(pen, LineCapSquareAnchor); + expect(Ok, status); + status = GdipSetPenEndCap(pen, LineCapSquareAnchor); + expect(Ok, status); + status = GdipWidenPath(path, pen, NULL, FlatnessDefault); + expect(Ok, status); + ok_path_fudge(path, widenline_capsquareanchor_multifigure_path, + ARRAY_SIZE(widenline_capsquareanchor_multifigure_path), FALSE, 0.000005); + GdipDeletePen(pen); + GdipDeletePath(path); } -- 2.23.0

2 3

[PATCH] strmbase: Support FORMAT_VideoInfo2 in strmbase_dump_media_type().
by Zebediah Figura 26 Mar '20

26 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/strmbase/mediatype.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 84fe0d8f69c..38c94e51487 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -23,6 +23,7 @@ #include "qedit.h" #include "d3d9.h" #include "vmr9.h" +#include "dvdmedia.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); @@ -216,9 +217,34 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) { VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat; - TRACE("source %s, target %s, bitrate %u, error rate %u, %s sec/frame, ", - wine_dbgstr_rect(&vih->rcSource), wine_dbgstr_rect(&vih->rcTarget), - vih->dwBitRate, vih->dwBitErrorRate, debugstr_time(vih->AvgTimePerFrame)); + if (!IsRectEmpty(&vih->rcSource)) TRACE("source %s, ", wine_dbgstr_rect(&vih->rcSource)); + if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget)); + if (vih->dwBitRate) TRACE("bitrate %u, ", vih->dwBitRate); + if (vih->dwBitErrorRate) TRACE("error rate %u, ", vih->dwBitErrorRate); + TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame)); + TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u", + vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes, + vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression), + vih->bmiHeader.biSizeImage); + if (vih->bmiHeader.biXPelsPerMeter || vih->bmiHeader.biYPelsPerMeter) + TRACE(", resolution %dx%d", vih->bmiHeader.biXPelsPerMeter, vih->bmiHeader.biYPelsPerMeter); + if (vih->bmiHeader.biClrUsed) TRACE(", %d colours", vih->bmiHeader.biClrUsed); + if (vih->bmiHeader.biClrImportant) TRACE(", %d important colours", vih->bmiHeader.biClrImportant); + TRACE(".\n"); + } + else if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2) && mt->cbFormat >= sizeof(VIDEOINFOHEADER2)) + { + VIDEOINFOHEADER2 *vih = (VIDEOINFOHEADER2 *)mt->pbFormat; + + if (!IsRectEmpty(&vih->rcSource)) TRACE("source %s, ", wine_dbgstr_rect(&vih->rcSource)); + if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget)); + if (vih->dwBitRate) TRACE("bitrate %u, ", vih->dwBitRate); + if (vih->dwBitErrorRate) TRACE("error rate %u, ", vih->dwBitErrorRate); + TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame)); + if (vih->dwInterlaceFlags) TRACE("interlace flags %#x, ", vih->dwInterlaceFlags); + if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#x, ", vih->dwCopyProtectFlags); + TRACE("aspect ratio %u/%u, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY); + if (vih->u.dwControlFlags) TRACE("control flags %#x, ", vih->u.dwControlFlags); TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u", vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes, vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression), -- 2.25.1

2 4

[PATCH] mf: Strip trailing zeroes in debugstr_time().
by Zebediah Figura 26 Mar '20

26 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mf/mf_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index dd8f49e1bc5..14f7288c9bb 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -72,6 +72,7 @@ static inline const char *debugstr_time(LONGLONG time) if (time < 0) buffer[i++] = '-'; while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; rev[j] = 0; return wine_dbg_sprintf("%s", rev); -- 2.25.1

1 1

[PATCH] winegstreamer: Also clear the pixel-aspect-ratio field in amt_to_gst_caps_video().
by Zebediah Figura 26 Mar '20

26 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gstdemux.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 138e7cad8c5..2d9efe8eada 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -409,11 +409,12 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight); if ((caps = gst_video_info_to_caps(&info))) { - /* Clear the framerate; we don't actually care about it. (Yes, - * VIDEOINFOHEADER has an AvgTimePerFrame field, but that shouldn't - * matter for checking compatible caps.) */ + /* Clear some fields that shouldn't prevent us from connecting. */ for (i = 0; i < gst_caps_get_size(caps); ++i) + { gst_structure_remove_field(gst_caps_get_structure(caps, i), "framerate"); + gst_structure_remove_field(gst_caps_get_structure(caps, i), "pixel-aspect-ratio"); + } } return caps; } -- 2.25.1

1 0

[PATCH] winegstreamer: Check the callback list before waiting.
by Rémi Bernon 26 Mar '20

26 Mar '20

Some callbacks may be pushed during pipeline initialization and before the dispatch thread is actually started and waiting for them, which sometimes causes some hangs. This fixes Fallout 3 and Panzer Corps -and possibly others- intro videos hanging forever. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/gst_cbs.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index a0618798d895..bf7103b1606b 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -66,15 +66,11 @@ static DWORD WINAPI dispatch_thread(void *user) while (1) { - pthread_cond_wait(&cb_list_cond, &cb_list_lock); + while (list_empty(&cb_list)) pthread_cond_wait(&cb_list_cond, &cb_list_lock); - while (!list_empty(&cb_list)) - { - cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry); - list_remove(&cbdata->entry); - - TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL); - } + cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry); + list_remove(&cbdata->entry); + TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL); } pthread_mutex_unlock(&cb_list_lock); -- 2.26.0.rc2

2 1

[PATCH] ntdll: Don't fail if LDR_MODULE.Flags is modified during load
by Myah Caron 26 Mar '20

26 Mar '20

Modifications to EntryPoint are respected, which is why it uses the original wm->ldr instead of ldr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48817 Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- dlls/ntdll/loader.c | 46 +++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1b641f1b9d..c54ef24c97 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -696,7 +696,7 @@ static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY proc = get_rva( module, functions[ordinal] ); /* if the address falls into the export dir, it's a forward */ - if (((const char *)proc >= (const char *)exports) && + if (((const char *)proc >= (const char *)exports) && ((const char *)proc < (const char *)exports + exp_size)) return find_forwarded_export( module, (const char *)proc, load_path ); @@ -1301,7 +1301,7 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) /************************************************************************* * MODULE_InitDLL */ -static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved ) +static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, LDR_MODULE ldr, UINT reason, LPVOID lpReserved ) { WCHAR mod_name[32]; NTSTATUS status = STATUS_SUCCESS; @@ -1311,19 +1311,19 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved /* Skip calls for modules loaded with special load flags */ - if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; - if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.BaseAddress, reason ); - if (!entry || !(wm->ldr.Flags & LDR_IMAGE_IS_DLL)) return STATUS_SUCCESS; + if (ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; + if (ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.BaseAddress, reason ); + if (!entry || !(ldr.Flags & LDR_IMAGE_IS_DLL)) return STATUS_SUCCESS; if (TRACE_ON(relay)) { - size_t len = min( wm->ldr.BaseDllName.Length, sizeof(mod_name)-sizeof(WCHAR) ); - memcpy( mod_name, wm->ldr.BaseDllName.Buffer, len ); + size_t len = min( ldr.BaseDllName.Length, sizeof(mod_name)-sizeof(WCHAR) ); + memcpy( mod_name, ldr.BaseDllName.Buffer, len ); mod_name[len / sizeof(WCHAR)] = 0; TRACE_(relay)("\1Call PE DLL (proc=%p,module=%p %s,reason=%s,res=%p)\n", entry, module, debugstr_w(mod_name), reason_names[reason], lpReserved ); } - else TRACE("(%p %s,%s,%p) - CALL\n", module, debugstr_w(wm->ldr.BaseDllName.Buffer), + else TRACE("(%p %s,%s,%p) - CALL\n", module, debugstr_w(ldr.BaseDllName.Buffer), reason_names[reason], lpReserved ); __TRY @@ -1389,6 +1389,7 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) NTSTATUS status = STATUS_SUCCESS; ULONG_PTR cookie; int i; + LDR_MODULE ldr_backup; if (process_detaching) return status; @@ -1404,6 +1405,9 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) if (lpReserved) wm->ldr.LoadCount = -1; /* pin it if imported by the main exe */ if (wm->ldr.ActivationContext) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); + /* The flags can be modified by DLL dependencies */ + ldr_backup = wm->ldr; + /* Recursively attach all DLLs this one depends on */ for ( i = 0; i < wm->nDeps; i++ ) { @@ -1422,14 +1426,14 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) current_modref = wm; call_ldr_notifications( LDR_DLL_NOTIFICATION_REASON_LOADED, &wm->ldr ); - status = MODULE_InitDLL( wm, DLL_PROCESS_ATTACH, lpReserved ); + status = MODULE_InitDLL( wm, ldr_backup, DLL_PROCESS_ATTACH, lpReserved ); if (status == STATUS_SUCCESS) { wm->ldr.Flags |= LDR_PROCESS_ATTACHED; } else { - MODULE_InitDLL( wm, DLL_PROCESS_DETACH, lpReserved ); + MODULE_InitDLL( wm, ldr_backup, DLL_PROCESS_DETACH, lpReserved ); call_ldr_notifications( LDR_DLL_NOTIFICATION_REASON_UNLOADED, &wm->ldr ); /* point to the name so LdrInitializeThunk can print it */ @@ -1486,13 +1490,14 @@ static void process_detach(void) { PLIST_ENTRY mark, entry; PLDR_MODULE mod; + WINE_MODREF *wm; mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; do { for (entry = mark->Blink; entry != mark; entry = entry->Blink) { - mod = CONTAINING_RECORD(entry, LDR_MODULE, + mod = CONTAINING_RECORD(entry, LDR_MODULE, InInitializationOrderModuleList); /* Check whether to detach this DLL */ if ( !(mod->Flags & LDR_PROCESS_ATTACHED) ) @@ -1502,7 +1507,8 @@ static void process_detach(void) /* Call detach notification */ mod->Flags &= ~LDR_PROCESS_ATTACHED; - MODULE_InitDLL( CONTAINING_RECORD(mod, WINE_MODREF, ldr), + wm = CONTAINING_RECORD(mod, WINE_MODREF, ldr); + MODULE_InitDLL( wm, wm->ldr, DLL_PROCESS_DETACH, ULongToPtr(process_detaching) ); call_ldr_notifications( LDR_DLL_NOTIFICATION_REASON_UNLOADED, mod ); @@ -1524,18 +1530,20 @@ static void thread_attach(void) { PLIST_ENTRY mark, entry; PLDR_MODULE mod; + WINE_MODREF *wm; mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; for (entry = mark->Flink; entry != mark; entry = entry->Flink) { - mod = CONTAINING_RECORD(entry, LDR_MODULE, + mod = CONTAINING_RECORD(entry, LDR_MODULE, InInitializationOrderModuleList); if ( !(mod->Flags & LDR_PROCESS_ATTACHED) ) continue; if ( mod->Flags & LDR_NO_DLL_CALLS ) continue; - MODULE_InitDLL( CONTAINING_RECORD(mod, WINE_MODREF, ldr), DLL_THREAD_ATTACH, NULL ); + wm = CONTAINING_RECORD(mod, WINE_MODREF, ldr); + MODULE_InitDLL( wm, wm->ldr, DLL_THREAD_ATTACH, NULL ); } } @@ -3032,7 +3040,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC case LO_DEFAULT: nts = load_builtin_dll( load_path, &nt_name, &module, flags, pwm ); if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && - (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) + (MODULE_InitDLL( *pwm, (*pwm)->ldr, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) { /* stub-only dll, try native */ TRACE( "%s pre-attach returned FALSE, preferring native\n", debugstr_us(&nt_name) ); @@ -3252,7 +3260,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count * LdrQueryProcessModuleInformation * */ -NTSTATUS WINAPI LdrQueryProcessModuleInformation(PSYSTEM_MODULE_INFORMATION smi, +NTSTATUS WINAPI LdrQueryProcessModuleInformation(PSYSTEM_MODULE_INFORMATION smi, ULONG buf_size, ULONG* req_size) { SYSTEM_MODULE* sm = &smi->Modules[0]; @@ -3522,6 +3530,7 @@ void WINAPI LdrShutdownThread(void) { PLIST_ENTRY mark, entry; PLDR_MODULE mod; + WINE_MODREF *wm; UINT i; void **pointers; @@ -3535,14 +3544,15 @@ void WINAPI LdrShutdownThread(void) mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; for (entry = mark->Blink; entry != mark; entry = entry->Blink) { - mod = CONTAINING_RECORD(entry, LDR_MODULE, + mod = CONTAINING_RECORD(entry, LDR_MODULE, InInitializationOrderModuleList); if ( !(mod->Flags & LDR_PROCESS_ATTACHED) ) continue; if ( mod->Flags & LDR_NO_DLL_CALLS ) continue; - MODULE_InitDLL( CONTAINING_RECORD(mod, WINE_MODREF, ldr), + wm = CONTAINING_RECORD(mod, WINE_MODREF, ldr); + MODULE_InitDLL( wm, wm->ldr, DLL_THREAD_DETACH, NULL ); } -- 2.25.1

3 3

[PATCH 1/5] ddraw: Silence enumeration conversion warnings. (Clang)
by Chip Davis 26 Mar '20

26 Mar '20

*We* know that these enums are equivalent, but Clang doesn't. So, tell Clang that it shouldn't care. The remaining warnings are due to a bug in Clang around unions with enum types. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/ddraw/device.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 048ba7fba66..69b3c4d4f6c 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2635,7 +2635,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; } - wined3d_stateblock_set_render_state(device->update_state, state, value); + wined3d_stateblock_set_render_state(device->update_state, (enum wined3d_render_state)state, value); break; } wined3d_mutex_unlock(); @@ -3116,7 +3116,7 @@ static HRESULT d3d_device7_SetTransform(IDirect3DDevice7 *iface, wined3d_state = WINED3D_TS_WORLD_MATRIX(3); break; default: - wined3d_state = state; + wined3d_state = (enum wined3d_transform_state)state; } if (!matrix) @@ -3225,7 +3225,7 @@ static HRESULT d3d_device7_GetTransform(IDirect3DDevice7 *iface, wined3d_state = WINED3D_TS_WORLD_MATRIX(3); break; default: - wined3d_state = state; + wined3d_state = (enum wined3d_transform_state)state; } if (!matrix) @@ -3329,7 +3329,7 @@ static HRESULT d3d_device7_MultiplyTransform(IDirect3DDevice7 *iface, wined3d_state = WINED3D_TS_WORLD_MATRIX(3); break; default: - wined3d_state = state; + wined3d_state = (enum wined3d_transform_state)state; } /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ @@ -3504,7 +3504,7 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, goto done; wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, (enum wined3d_primitive_type)primitive_type, 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vertex_count); @@ -3715,7 +3715,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, WINED3DFMT_R16_UINT); wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, (enum wined3d_primitive_type)primitive_type, 0); wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / stride); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(*indices), index_count); @@ -4042,7 +4042,7 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM goto done; wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, (enum wined3d_primitive_type)primitive_type, 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / dst_stride, vertex_count); @@ -4178,7 +4178,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vtx_dst_stride); wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, (enum wined3d_primitive_type)primitive_type, 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); @@ -4300,7 +4300,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE } /* Now draw the primitives */ - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, (enum wined3d_primitive_type)primitive_type, 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); @@ -4454,7 +4454,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return hr; } - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, (enum wined3d_primitive_type)primitive_type, 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); @@ -6005,7 +6005,7 @@ static HRESULT d3d_device7_CreateStateBlock(IDirect3DDevice7 *iface, } /* The D3DSTATEBLOCKTYPE enum is fine here. */ - hr = wined3d_stateblock_create(device->wined3d_device, device->state, type, &wined3d_sb); + hr = wined3d_stateblock_create(device->wined3d_device, device->state, (enum wined3d_stateblock_type)type, &wined3d_sb); if (FAILED(hr)) { WARN("Failed to create stateblock, hr %#x.\n", hr); -- 2.24.0

3 7

[PATCH 2/2] dbghelp: Use LONG_PTR instead of long type.
by Jacek Caban 26 Mar '20

26 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/cpu_i386.c | 2 +- dlls/dbghelp/dbghelp_private.h | 68 +++++++++++----------- dlls/dbghelp/dwarf.c | 100 ++++++++++++++++----------------- dlls/dbghelp/elf_module.c | 50 ++++++++--------- dlls/dbghelp/image_private.h | 2 +- dlls/dbghelp/macho_module.c | 70 +++++++++++------------ dlls/dbghelp/minidump.c | 2 +- dlls/dbghelp/module.c | 4 +- dlls/dbghelp/msc.c | 6 +- dlls/dbghelp/stabs.c | 54 +++++++++--------- dlls/dbghelp/storage.c | 8 +-- dlls/dbghelp/symbol.c | 18 +++--- dlls/dbghelp/type.c | 2 +- 13 files changed, 193 insertions(+), 193 deletions(-)

1 0

[PATCH 1/2] dbghelp: Remove unused code in module_find_cb.
by Jacek Caban 26 Mar '20

26 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/path.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-)

1 0

[PATCH 1/3] mfplat: Add more event types to trace.
by Nikolay Sivov 26 Mar '20

26 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 13 +++++++++++++ include/mfobjects.idl | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8d9dffe075..e3cb35d866 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2056,6 +2056,19 @@ static const char *debugstr_eventid(DWORD event) X(MEWMDRMProximityCompleted), X(MEWMDRMLicenseStoreCleaned), X(MEWMDRMRevocationDownloadCompleted), + X(METransformUnknown), + X(METransformNeedInput), + X(METransformHaveOutput), + X(METransformDrainComplete), + X(METransformMarker), + X(METransformInputStreamStateChanged), + X(MEByteStreamCharacteristicsChanged), + X(MEVideoCaptureDeviceRemoved), + X(MEVideoCaptureDevicePreempted), + X(MEStreamSinkFormatInvalidated), + X(MEEncodingParameters), + X(MEContentProtectionMetadata), + X(MEDeviceThermalStateChanged), #undef X }; diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 8e3d65c77c..ee49be35af 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -567,6 +567,19 @@ enum { MEWMDRMLicenseStoreCleaned = 515, MEWMDRMRevocationDownloadCompleted = 516, MEWMDRMV1Anchor = MEWMDRMRevocationDownloadCompleted, + METransformUnknown = 600, + METransformNeedInput = 601, + METransformHaveOutput = 602, + METransformDrainComplete = 603, + METransformMarker = 604, + METransformInputStreamStateChanged = 605, + MEByteStreamCharacteristicsChanged = 700, + MEVideoCaptureDeviceRemoved = 800, + MEVideoCaptureDevicePreempted = 801, + MEStreamSinkFormatInvalidated = 802, + MEEncodingParameters = 803, + MEContentProtectionMetadata = 900, + MEDeviceThermalStateChanged = 950, MEReservedMax = 10000 }; -- 2.25.1

2 3