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

Zebediah Figura : winegstreamer: Use accessor macros for GstVideoInfo fields.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: 3178f1d0afc2170da61175ae3fbeb9e01e840083 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3178f1d0afc2170da61175ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 14:40:14 2020 -0500 winegstreamer: Use accessor macros for GstVideoInfo fields. As the documentation prescribes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0b00fc5339..40301c0d63 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -176,15 +176,13 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * { VIDEOINFOHEADER *vih; BITMAPINFOHEADER *bih; - gint32 width, height, nom, denom; + gint32 width, height; GstVideoInfo vinfo; if (!gst_video_info_from_caps (&vinfo, caps)) return FALSE; - width = vinfo.width; - height = vinfo.height; - nom = vinfo.fps_n; - denom = vinfo.fps_d; + width = GST_VIDEO_INFO_WIDTH(&vinfo); + height = GST_VIDEO_INFO_HEIGHT(&vinfo); vih = CoTaskMemAlloc(sizeof(*vih)); bih = &vih->bmiHeader; @@ -201,7 +199,7 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * if (GST_VIDEO_INFO_IS_RGB(&vinfo)) { - switch (vinfo.finfo->format) + switch (GST_VIDEO_INFO_FORMAT(&vinfo)) { case GST_VIDEO_FORMAT_BGRA: amt->subtype = MEDIASUBTYPE_ARGB32; @@ -224,14 +222,15 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * bih->biBitCount = 16; break; default: - FIXME("Unhandled type %s.\n", vinfo.finfo->name); + FIXME("Unhandled type %s.\n", GST_VIDEO_INFO_NAME(&vinfo)); CoTaskMemFree(vih); return FALSE; } bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; - if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(vinfo.finfo->format))) { + if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(GST_VIDEO_INFO_FORMAT(&vinfo)))) + { CoTaskMemFree(vih); return FALSE; } @@ -248,7 +247,8 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * bih->biCompression = amt->subtype.Data1; } bih->biSizeImage = width * height * bih->biBitCount / 8; - if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, denom, nom)) == -1) + if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, + GST_VIDEO_INFO_FPS_D(&vinfo), GST_VIDEO_INFO_FPS_N(&vinfo))) == -1) vih->AvgTimePerFrame = 0; /* zero division or integer overflow */ bih->biSize = sizeof(*bih); bih->biWidth = width;

1 0

Zebediah Figura : winegstreamer: Use amt_from_gst_video_info() in gstdecoder_source_get_media_type().
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: 1bb868e9c1ca5ffbe1d6070ec5275123f3dcd69e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb868e9c1ca5ffbe1d6070e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 14:40:15 2020 -0500 winegstreamer: Use amt_from_gst_video_info() in gstdecoder_source_get_media_type(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 74 +++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 40301c0d63..a8b1098752 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -172,17 +172,14 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * return TRUE; } -static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE *amt) +static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE *amt) { VIDEOINFOHEADER *vih; BITMAPINFOHEADER *bih; gint32 width, height; - GstVideoInfo vinfo; - if (!gst_video_info_from_caps (&vinfo, caps)) - return FALSE; - width = GST_VIDEO_INFO_WIDTH(&vinfo); - height = GST_VIDEO_INFO_HEIGHT(&vinfo); + width = GST_VIDEO_INFO_WIDTH(info); + height = GST_VIDEO_INFO_HEIGHT(info); vih = CoTaskMemAlloc(sizeof(*vih)); bih = &vih->bmiHeader; @@ -197,9 +194,9 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * ZeroMemory(vih, sizeof(*vih)); amt->majortype = MEDIATYPE_Video; - if (GST_VIDEO_INFO_IS_RGB(&vinfo)) + if (GST_VIDEO_INFO_IS_RGB(info)) { - switch (GST_VIDEO_INFO_FORMAT(&vinfo)) + switch (GST_VIDEO_INFO_FORMAT(info)) { case GST_VIDEO_FORMAT_BGRA: amt->subtype = MEDIASUBTYPE_ARGB32; @@ -222,14 +219,14 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * bih->biBitCount = 16; break; default: - FIXME("Unhandled type %s.\n", GST_VIDEO_INFO_NAME(&vinfo)); + FIXME("Unhandled type %s.\n", GST_VIDEO_INFO_NAME(info)); CoTaskMemFree(vih); return FALSE; } bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; - if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(GST_VIDEO_INFO_FORMAT(&vinfo)))) + if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(GST_VIDEO_INFO_FORMAT(info)))) { CoTaskMemFree(vih); return FALSE; @@ -248,7 +245,7 @@ static gboolean amt_from_gst_caps_video_raw(const GstCaps *caps, AM_MEDIA_TYPE * } bih->biSizeImage = width * height * bih->biBitCount / 8; if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, - GST_VIDEO_INFO_FPS_D(&vinfo), GST_VIDEO_INFO_FPS_N(&vinfo))) == -1) + GST_VIDEO_INFO_FPS_D(info), GST_VIDEO_INFO_FPS_N(info))) == -1) vih->AvgTimePerFrame = 0; /* zero division or integer overflow */ bih->biSize = sizeof(*bih); bih->biWidth = width; @@ -331,7 +328,13 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) if (!strcmp(type, "audio/x-raw")) return amt_from_gst_caps_audio_raw(caps, mt); else if (!strcmp(type, "video/x-raw")) - return amt_from_gst_caps_video_raw(caps, mt); + { + GstVideoInfo info; + + if (!gst_video_info_from_caps(&info, caps)) + return FALSE; + return amt_from_gst_video_info(&info, mt); + } else if (!strcmp(type, "audio/mpeg")) return amt_from_gst_caps_audio_mpeg(caps, mt); else if (!strcmp(type, "video/x-cinepak")) @@ -1649,26 +1652,19 @@ static HRESULT gstdecoder_source_query_accept(struct gstdemux_source *pin, const static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { - static const struct - { - const GUID *subtype; - WORD bpp; - DWORD compression; - } - video_types[] = + static const GstVideoFormat video_formats[] = { /* Roughly ordered by preference from videoflip. */ - {&MEDIASUBTYPE_AYUV, 32, mmioFOURCC('A','Y','U','V')}, - {&MEDIASUBTYPE_ARGB32, 32, BI_RGB}, - {&MEDIASUBTYPE_RGB32, 32, BI_RGB}, - {&MEDIASUBTYPE_RGB24, 24, BI_RGB}, - {&MEDIASUBTYPE_I420, 12, mmioFOURCC('I','4','2','0')}, - {&MEDIASUBTYPE_YV12, 12, mmioFOURCC('Y','V','1','2')}, - {&MEDIASUBTYPE_IYUV, 12, mmioFOURCC('I','Y','U','V')}, - {&MEDIASUBTYPE_YUY2, 16, mmioFOURCC('Y','U','Y','2')}, - {&MEDIASUBTYPE_UYVY, 16, mmioFOURCC('U','Y','V','Y')}, - {&MEDIASUBTYPE_YVYU, 16, mmioFOURCC('Y','V','Y','U')}, - {&MEDIASUBTYPE_NV12, 12, mmioFOURCC('N','V','1','2')}, + GST_VIDEO_FORMAT_AYUV, + GST_VIDEO_FORMAT_BGRA, + GST_VIDEO_FORMAT_BGRx, + GST_VIDEO_FORMAT_BGR, + GST_VIDEO_FORMAT_I420, + GST_VIDEO_FORMAT_YV12, + GST_VIDEO_FORMAT_YUY2, + GST_VIDEO_FORMAT_UYVY, + GST_VIDEO_FORMAT_YVYU, + GST_VIDEO_FORMAT_NV12, }; if (!index) @@ -1677,19 +1673,15 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, return S_OK; } else if (IsEqualGUID(&pin->mt.majortype, &MEDIATYPE_Video) - && index - 1 < ARRAY_SIZE(video_types)) + && index - 1 < ARRAY_SIZE(video_formats)) { - VIDEOINFOHEADER *vih; + const VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)pin->mt.pbFormat; + GstVideoInfo info; - *mt = pin->mt; - mt->subtype = *video_types[index - 1].subtype; - mt->pbFormat = CoTaskMemAlloc(pin->mt.cbFormat); - memcpy(mt->pbFormat, pin->mt.pbFormat, pin->mt.cbFormat); - vih = (VIDEOINFOHEADER *)mt->pbFormat; - vih->bmiHeader.biBitCount = video_types[index - 1].bpp; - vih->bmiHeader.biCompression = video_types[index - 1].compression; - vih->bmiHeader.biSizeImage = vih->bmiHeader.biWidth - * vih->bmiHeader.biHeight * vih->bmiHeader.biBitCount / 8; + gst_video_info_set_format(&info, video_formats[index - 1], + vih->bmiHeader.biWidth, vih->bmiHeader.biHeight); + if (!amt_from_gst_video_info(&info, mt)) + return E_OUTOFMEMORY; return S_OK; } else if (IsEqualGUID(&pin->mt.majortype, &MEDIATYPE_Audio) && index == 1)

1 0

Zebediah Figura : winegstreamer: Use the image size provided by GStreamer.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: 8575484f2192d5394903f3362601f4131bd7f25c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8575484f2192d5394903f336… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 16 14:40:16 2020 -0500 winegstreamer: Use the image size provided by GStreamer. If the stride is not equal to the width, this calculation will be invalid. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a8b1098752..9d7f85b82d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -243,7 +243,7 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE } bih->biCompression = amt->subtype.Data1; } - bih->biSizeImage = width * height * bih->biBitCount / 8; + bih->biSizeImage = GST_VIDEO_INFO_SIZE(info); if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, GST_VIDEO_INFO_FPS_D(info), GST_VIDEO_INFO_FPS_N(info))) == -1) vih->AvgTimePerFrame = 0; /* zero division or integer overflow */

1 0

Jacek Caban : ucrtbase/tests: Build with -fno-builtin.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: f202beb7454e3c39de7a8271c4a2f05f21d3c8bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f202beb7454e3c39de7a8271… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 21:12:32 2020 +0100 ucrtbase/tests: Build with -fno-builtin. Some of tested functions are handled as builtin compiler functions. We always want to test our actual implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in index 126cafd66d..259880a7d9 100644 --- a/dlls/ucrtbase/tests/Makefile.in +++ b/dlls/ucrtbase/tests/Makefile.in @@ -1,5 +1,6 @@ TESTDLL = ucrtbase.dll IMPORTS = ucrtbase +EXTRADEFS = -fno-builtin C_SRCS = \ cpp.c \

1 0

Zebediah Figura : wineqtdecoder: Fix compilation.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: c38325109bc081e932e6386905dcd3827c1aad47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c38325109bc081e932e63869… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 14 14:10:25 2020 -0500 wineqtdecoder: Fix compilation. Partially written by Alistair Leslie-Hughes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtvdecoder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index eaaf30acdb..41b29786cc 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -128,8 +128,6 @@ #include "qtprivate.h" #include "wineqtdecoder_classes.h" -extern CLSID CLSID_QTVDecoder; - WINE_DEFAULT_DEBUG_CHANNEL(qtdecoder); typedef struct QTVDecoderImpl @@ -137,6 +135,8 @@ typedef struct QTVDecoderImpl struct strmbase_filter filter; CRITICAL_SECTION stream_cs; + AM_MEDIA_TYPE mt; + struct strmbase_source source; IUnknown *seeking; @@ -266,7 +266,7 @@ error: This->decodeHR = hr; } -static HRESULT WINAPI video_decoder_Receive(struct strmbase_sink *iface, IMediaSample *pSample) +static HRESULT WINAPI video_decoder_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample) { QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter); HRESULT hr; @@ -504,7 +504,7 @@ static HRESULT video_decoder_source_get_media_type(struct strmbase_pin *iface, return S_OK; } -static HRESULT WINAPI video_decoder_DecideBufferSize(struct strmbase_source *iface, +static HRESULT WINAPI video_decoder_source_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter); @@ -590,7 +590,7 @@ static HRESULT video_decoder_init_stream(struct strmbase_filter *iface) static HRESULT video_decoder_cleanup_stream(struct strmbase_filter *iface) { - QTVDecoderImpl* This = impl_from_TransformFilter(pTransformFilter); + QTVDecoderImpl* This = impl_from_strmbase_filter(iface); if (This->decompressionSession) ICMDecompressionSessionRelease(This->decompressionSession); @@ -611,6 +611,7 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) { QTVDecoderImpl *object; HRESULT hr; + ISeekingPassThru *passthrough; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -640,6 +641,6 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) ISeekingPassThru_Release(passthrough); TRACE("Created video decoder %p.\n", object); - *out = &object->tf.filter.IUnknown_inner; + *out = &object->filter.IUnknown_inner; return S_OK; }

1 0

Jacek Caban : dbghelp: Pass module struct to elf_locate_debug_link.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: 5ba1c5960e716bdec9052efeb9f3ddfba3cf9e0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ba1c5960e716bdec9052efe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 16:06:31 2020 +0100 dbghelp: Pass module struct to elf_locate_debug_link. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 0d190e549c..6bfd58b917 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1004,8 +1004,7 @@ static BOOL elf_check_debug_link(const WCHAR* file, struct image_file_map* fmap, * is the global debug file directory, and execdir has been turned * into a relative path)." (from GDB manual) */ -static BOOL elf_locate_debug_link(struct image_file_map* fmap, const char* filename, - const WCHAR* loaded_file, DWORD crc) +static BOOL elf_locate_debug_link(const struct module* module, struct image_file_map* fmap, const char* filename, DWORD crc) { static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; static const WCHAR dotDebugW[] = {'.','d','e','b','u','g','/'}; @@ -1020,13 +1019,13 @@ static BOOL elf_locate_debug_link(struct image_file_map* fmap, const char* filen if (!fmap_link) return FALSE; filename_len = MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, NULL, 0); - path_len = strlenW(loaded_file); + path_len = strlenW(module->module.LoadedImageName); p = HeapAlloc(GetProcessHeap(), 0, (globalDebugDirLen + path_len + 6 + 1 + filename_len + 1) * sizeof(WCHAR)); if (!p) goto found; /* we prebuild the string with "execdir" */ - strcpyW(p, loaded_file); + strcpyW(p, module->module.LoadedImageName); slash = p; if ((slash2 = strrchrW(slash, '/'))) slash = slash2 + 1; if ((slash2 = strrchrW(slash, '\\'))) slash = slash2 + 1; @@ -1190,7 +1189,7 @@ static BOOL elf_check_alternate(struct image_file_map* fmap, const struct module * 3/ CRC of the linked ELF file */ DWORD crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); - ret = elf_locate_debug_link(fmap, dbg_link, module->module.LoadedImageName, crc); + ret = elf_locate_debug_link(module, fmap, dbg_link, crc); if (!ret) WARN("Couldn't load linked debug file for %s\n", debugstr_w(module->module.ModuleName));

1 0

Jacek Caban : dbghelp: Support Windows paths in elf_locate_debug_link.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: e1b28a9c988ef0ff49d7254fd7ba05316f1c9b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1b28a9c988ef0ff49d7254f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 16:06:18 2020 +0100 dbghelp: Support Windows paths in elf_locate_debug_link. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e0ae195cd8..0d190e549c 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1010,23 +1010,26 @@ static BOOL elf_locate_debug_link(struct image_file_map* fmap, const char* filen static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; static const WCHAR dotDebugW[] = {'.','d','e','b','u','g','/'}; const size_t globalDebugDirLen = ARRAY_SIZE(globalDebugDirW); - size_t filename_len; + size_t filename_len, path_len; WCHAR* p = NULL; WCHAR* slash; + WCHAR* slash2; struct image_file_map* fmap_link = NULL; fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); if (!fmap_link) return FALSE; filename_len = MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, NULL, 0); + path_len = strlenW(loaded_file); p = HeapAlloc(GetProcessHeap(), 0, - (globalDebugDirLen + strlenW(loaded_file) + 6 + 1 + filename_len + 1) * sizeof(WCHAR)); + (globalDebugDirLen + path_len + 6 + 1 + filename_len + 1) * sizeof(WCHAR)); if (!p) goto found; /* we prebuild the string with "execdir" */ strcpyW(p, loaded_file); - slash = strrchrW(p, '/'); - if (slash == NULL) slash = p; else slash++; + slash = p; + if ((slash2 = strrchrW(slash, '/'))) slash = slash2 + 1; + if ((slash2 = strrchrW(slash, '\\'))) slash = slash2 + 1; /* testing execdir/filename */ MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len);

1 0

Jacek Caban : dbghelp: Move HANDLE-based crc32 helper to dbghelp.c.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: a5a6b0dcb65d8e3576e34d350c80f4789dcfdb7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5a6b0dcb65d8e3576e34d35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 16:06:10 2020 +0100 dbghelp: Move HANDLE-based crc32 helper to dbghelp.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 8 ++++---- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 18 +++--------------- dlls/dbghelp/macho_module.c | 16 ++++++++++++++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 413d89eb59..03e721f0c9 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -723,14 +723,14 @@ void WINAPI WinDbgExtensionDllInit(PWINDBG_EXTENSION_APIS lpExtensionApis, { } -DWORD calc_crc32(int fd) +DWORD calc_crc32(HANDLE handle) { BYTE buffer[8192]; DWORD crc = 0; - int len; + DWORD len; - lseek(fd, 0, SEEK_SET); - while ((len = read(fd, buffer, sizeof(buffer))) > 0) + SetFilePointer(handle, 0, 0, FILE_BEGIN); + while (ReadFile(handle, buffer, sizeof(buffer), &len, NULL) && len) crc = RtlComputeCrc32(crc, buffer, len); return crc; } diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index eea966d6b3..b143216dd0 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -588,7 +588,7 @@ extern BOOL pcs_callback(const struct process* pcs, ULONG action, void* extern void* fetch_buffer(struct process* pcs, unsigned size) DECLSPEC_HIDDEN; extern const char* wine_dbgstr_addr(const ADDRESS64* addr) DECLSPEC_HIDDEN; extern struct cpu* cpu_find(DWORD) DECLSPEC_HIDDEN; -extern DWORD calc_crc32(int fd) DECLSPEC_HIDDEN; +extern DWORD calc_crc32(HANDLE handle) DECLSPEC_HIDDEN; typedef BOOL (*enum_modules_cb)(const WCHAR*, unsigned long addr, void* user); diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 961fece746..e0ae195cd8 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -966,18 +966,6 @@ static int elf_new_public_symbols(struct module* module, const struct hash_table return TRUE; } -static DWORD calc_crc(HANDLE handle) -{ - BYTE buffer[8192]; - DWORD crc = 0; - DWORD len; - - SetFilePointer(handle, 0, 0, FILE_BEGIN); - while (ReadFile(handle, buffer, sizeof(buffer), &len, NULL) && len) - crc = RtlComputeCrc32(crc, buffer, len); - return crc; -} - static BOOL elf_check_debug_link(const WCHAR* file, struct image_file_map* fmap, DWORD link_crc) { struct elf_map_file_data emfd; @@ -987,7 +975,7 @@ static BOOL elf_check_debug_link(const WCHAR* file, struct image_file_map* fmap, emfd.u.file.filename = file; if (!elf_map_file(&emfd, fmap)) return FALSE; - crc = calc_crc(fmap->u.elf.handle); + crc = calc_crc32(fmap->u.elf.handle); if (crc != link_crc) { WARN("Bad CRC for file %s (got %08x while expecting %08x)\n", debugstr_w(file), crc, link_crc); @@ -1336,7 +1324,7 @@ BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, if (!elf_map_file(&emfd, &fmap)) return FALSE; if (base) *base = fmap.u.elf.elf_start; *size = fmap.u.elf.elf_size; - *checksum = calc_crc(fmap.u.elf.handle); + *checksum = calc_crc32(fmap.u.elf.handle); image_unmap_file(&fmap); return TRUE; } @@ -1432,7 +1420,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, sizeof(struct module_format) + sizeof(struct elf_module_info)); if (!modfmt) return FALSE; elf_info->module = module_new(pcs, filename, DMT_ELF, FALSE, modbase, - fmap->u.elf.elf_size, 0, calc_crc(fmap->u.elf.handle)); + fmap->u.elf.elf_size, 0, calc_crc32(fmap->u.elf.handle)); if (!elf_info->module) { HeapFree(GetProcessHeap(), 0, modfmt); diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 9d4fc4e47a..5960b0dfc3 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -152,6 +152,18 @@ static char* format_uuid(const uint8_t uuid[16], char out[UUID_STRING_LEN]) return out; } +static DWORD macho_calc_crc32(int fd) +{ + BYTE buffer[8192]; + DWORD crc = 0; + int len; + + lseek(fd, 0, SEEK_SET); + while ((len = read(fd, buffer, sizeof(buffer))) > 0) + crc = RtlComputeCrc32(crc, buffer, len); + return crc; +} + /****************************************************************** * macho_calc_range * @@ -1369,7 +1381,7 @@ BOOL macho_fetch_file_info(HANDLE process, const WCHAR* name, unsigned long load if (!macho_map_file(pcs, name, split_segs, &fmap)) return FALSE; if (base) *base = fmap.u.macho.segs_start; *size = fmap.u.macho.segs_size; - *checksum = calc_crc32(fmap.u.macho.fd); + *checksum = macho_calc_crc32(fmap.u.macho.fd); macho_unmap_file(&fmap); return TRUE; } @@ -1484,7 +1496,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, if (!load_addr) load_addr = fmap.u.macho.segs_start; macho_info->module = module_new(pcs, filename, DMT_MACHO, FALSE, load_addr, - fmap.u.macho.segs_size, 0, calc_crc32(fmap.u.macho.fd)); + fmap.u.macho.segs_size, 0, macho_calc_crc32(fmap.u.macho.fd)); if (!macho_info->module) { HeapFree(GetProcessHeap(), 0, modfmt);

1 0

Jacek Caban : dbghelp: Use vtbl to handle different image_file_map types.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: 95a5f8296188d7dd8ffb86afd4f0c3280e2f5656 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a5f8296188d7dd8ffb86af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 16:05:39 2020 +0100 dbghelp: Use vtbl to handle different image_file_map types. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 44 +++++++++--------------- dlls/dbghelp/image_private.h | 79 ++++++++------------------------------------ dlls/dbghelp/macho_module.c | 41 +++++++++-------------- dlls/dbghelp/pe_module.c | 24 ++++++++++---- 4 files changed, 62 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95a5f8296188d7dd8ffb…

1 0

Jacek Caban : dbghelp: Move alternate file map pointer to generic image_file_map.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: 02dfd959ca6f2295ca279ab65f6b6429cd53673c URL: https://source.winehq.org/git/wine.git/?a=commit;h=02dfd959ca6f2295ca279ab6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 16:05:23 2020 +0100 dbghelp: Move alternate file map pointer to generic image_file_map. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 61 +++++++++++++++++++++++++++++--------------- dlls/dbghelp/image_private.h | 27 +++++++++++++++----- dlls/dbghelp/macho_module.c | 1 + dlls/dbghelp/pe_module.c | 1 + 4 files changed, 63 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02dfd959ca6f2295ca27…

1 0