April 2021 - Wine-commits - list.winehq.org

Nikolay Sivov : evr/presenter: Set sample size attributes when configuring mixer output.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 9973081f707a7b27633a7fcd57319d8b27aa1b9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9973081f707a7b27633a7fcd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 19 16:03:07 2021 +0300 evr/presenter: Set sample size attributes when configuring mixer output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 42c4c81d9d3..c86dccc7b44 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -312,6 +312,9 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, static HRESULT video_presenter_configure_output_type(struct video_presenter *presenter, const MFVideoArea *aperture, IMFMediaType *media_type) { + unsigned int size; + GUID subtype; + LONG stride; HRESULT hr; hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)aperture->Area.cx << 32 | aperture->Area.cy); @@ -320,6 +323,20 @@ static HRESULT video_presenter_configure_output_type(struct video_presenter *pre if (SUCCEEDED(hr)) hr = IMFMediaType_SetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (UINT8 *)aperture, sizeof(*aperture)); + if (SUCCEEDED(hr)) + hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); + + if (SUCCEEDED(hr)) + { + hr = MFGetStrideForBitmapInfoHeader(subtype.Data1, aperture->Area.cx, &stride); + if (SUCCEEDED(hr)) + hr = MFGetPlaneSize(subtype.Data1, aperture->Area.cx, aperture->Area.cy, &size); + if (SUCCEEDED(hr)) + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, stride); + if (SUCCEEDED(hr)) + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_SAMPLE_SIZE, stride); + } + return hr; }

1 0

Nikolay Sivov : evr/presenter: Fix sample queue loop present condition.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 79e2d5d350fc9ebb6599afa91f5e25691766d9ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=79e2d5d350fc9ebb6599afa9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 19 16:03:08 2021 +0300 evr/presenter: Fix sample queue loop present condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index c86dccc7b44..cbf799b61a1 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -541,13 +541,14 @@ static void video_presenter_check_queue(struct video_presenter *presenter, { LONGLONG pts, clocktime, delta; unsigned int wait = 0; - BOOL present = TRUE; IMFSample *sample; MFTIME systime; + BOOL present; HRESULT hr; while (video_presenter_sample_queue_pop(presenter, &sample)) { + present = TRUE; wait = 0; if (presenter->clock)

1 0

Nikolay Sivov : evr/presenter: Add missing allocation error path.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 2764d3e3bad2741e4febc0fb8b51e2a0d978e923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2764d3e3bad2741e4febc0fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 19 16:03:09 2021 +0300 evr/presenter: Add missing allocation error path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index cbf799b61a1..414ba5bcaa0 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -391,17 +391,21 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre return hr; } -static void video_presenter_sample_queue_init(struct video_presenter *presenter) +static HRESULT video_presenter_sample_queue_init(struct video_presenter *presenter) { struct sample_queue *queue = &presenter->thread.queue; if (queue->size) - return; + return S_OK; memset(queue, 0, sizeof(*queue)); - queue->samples = calloc(presenter->allocator_capacity, sizeof(*queue->samples)); + if (!(queue->samples = calloc(presenter->allocator_capacity, sizeof(*queue->samples)))) + return E_OUTOFMEMORY; + queue->size = presenter->allocator_capacity; queue->back = queue->size - 1; + + return S_OK; } static void video_presenter_sample_queue_push(struct video_presenter *presenter, IMFSample *sample) @@ -714,10 +718,13 @@ static DWORD CALLBACK video_presenter_streaming_thread(void *arg) static HRESULT video_presenter_start_streaming(struct video_presenter *presenter) { + HRESULT hr; + if (presenter->thread.hthread) return S_OK; - video_presenter_sample_queue_init(presenter); + if (FAILED(hr = video_presenter_sample_queue_init(presenter))) + return hr; if (!(presenter->thread.ready_event = CreateEventW(NULL, FALSE, FALSE, NULL))) return HRESULT_FROM_WIN32(GetLastError());

1 0

Michele Dionisio : msvcrt: Add __stdio_common_vfprintf_p and __stdio_common_vfwprintf_p.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 8ea43f388f760c247642b327c37e46d67c58c585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea43f388f760c247642b327… Author: Michele Dionisio <michele.dionisio(a)gmail.com> Date: Sat Apr 17 08:42:52 2021 +0200 msvcrt: Add __stdio_common_vfprintf_p and __stdio_common_vfwprintf_p. Signed-off-by: Michele Dionisio <michele.dionisio(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 4 ++-- .../api-ms-win-crt-stdio-l1-1-0.spec | 4 ++-- dlls/msvcrt/file.c | 28 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 8 +++---- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 136358a174c..246dde7dbdf 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -147,11 +147,11 @@ @ cdecl _o___std_type_info_destroy_list(ptr) ucrtbase._o___std_type_info_destroy_list @ cdecl _o___std_type_info_name(ptr ptr) ucrtbase._o___std_type_info_name @ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase._o___stdio_common_vfprintf -@ stub _o___stdio_common_vfprintf_p +@ cdecl _o___stdio_common_vfprintf_p(int64 ptr str ptr ptr) ucrtbase._o___stdio_common_vfprintf_p @ cdecl _o___stdio_common_vfprintf_s(int64 ptr str ptr ptr) ucrtbase._o___stdio_common_vfprintf_s @ cdecl _o___stdio_common_vfscanf(int64 ptr str ptr ptr) ucrtbase._o___stdio_common_vfscanf @ cdecl _o___stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase._o___stdio_common_vfwprintf -@ stub _o___stdio_common_vfwprintf_p +@ cdecl _o___stdio_common_vfwprintf_p(int64 ptr wstr ptr ptr) ucrtbase._o___stdio_common_vfwprintf_p @ cdecl _o___stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) ucrtbase._o___stdio_common_vfwprintf_s @ cdecl _o___stdio_common_vfwscanf(int64 ptr wstr ptr ptr) ucrtbase._o___stdio_common_vfwscanf @ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase._o___stdio_common_vsnprintf_s diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 19c06eaa67d..fce22df0357 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -2,11 +2,11 @@ @ cdecl __p__commode() ucrtbase.__p__commode @ cdecl __p__fmode() ucrtbase.__p__fmode @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf -@ stub __stdio_common_vfprintf_p +@ cdecl __stdio_common_vfprintf_p(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf_p @ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf_s @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfscanf @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf -@ stub __stdio_common_vfwprintf_p +@ cdecl __stdio_common_vfwprintf_p(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf_p @ cdecl __stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf_s @ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index bf7496cc233..6e955099090 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5257,6 +5257,20 @@ int CDECL _stdio_common_vfprintf(unsigned __int64 options, FILE *file, const cha return vfprintf_helper(options & UCRTBASE_PRINTF_MASK, file, format, locale, valist); } +/********************************************************************* + * __stdio_common_vfprintf_p (UCRTBASE.@) + */ +int CDECL __stdio_common_vfprintf_p(unsigned __int64 options, FILE *file, const char *format, + _locale_t locale, __ms_va_list valist) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + + return vfprintf_helper((options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_POSITIONAL_PARAMS + | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, locale, valist); +} + + /********************************************************************* * __stdio_common_vfprintf_s (UCRTBASE.@) */ @@ -5282,6 +5296,20 @@ int CDECL __stdio_common_vfwprintf(unsigned __int64 options, FILE *file, const w return vfwprintf_helper(options & UCRTBASE_PRINTF_MASK, file, format, locale, valist); } +/********************************************************************* + * __stdio_common_vfwprintf_p (UCRTBASE.@) + */ +int CDECL __stdio_common_vfwprintf_p(unsigned __int64 options, FILE *file, const wchar_t *format, + _locale_t locale, __ms_va_list valist) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + + return vfwprintf_helper((options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_POSITIONAL_PARAMS + | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, locale, valist); +} + + /********************************************************************* * __stdio_common_vfwprintf_s (UCRTBASE.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8f331825fc4..cc6f2e70f6b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -147,11 +147,11 @@ @ cdecl __std_type_info_hash(ptr) @ cdecl __std_type_info_name(ptr ptr) @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) _stdio_common_vfprintf -@ stub __stdio_common_vfprintf_p +@ cdecl __stdio_common_vfprintf_p(int64 ptr str ptr ptr) @ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) -@ stub __stdio_common_vfwprintf_p +@ cdecl __stdio_common_vfwprintf_p(int64 ptr wstr ptr ptr) @ cdecl __stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) @ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) @@ -811,11 +811,11 @@ @ cdecl _o___std_type_info_destroy_list(ptr) __std_type_info_destroy_list @ cdecl _o___std_type_info_name(ptr ptr) __std_type_info_name @ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) _stdio_common_vfprintf -@ stub _o___stdio_common_vfprintf_p +@ cdecl _o___stdio_common_vfprintf_p(int64 ptr str ptr ptr) __stdio_common_vfprintf_p @ cdecl _o___stdio_common_vfprintf_s(int64 ptr str ptr ptr) __stdio_common_vfprintf_s @ cdecl _o___stdio_common_vfscanf(int64 ptr str ptr ptr) __stdio_common_vfscanf @ cdecl _o___stdio_common_vfwprintf(int64 ptr wstr ptr ptr) __stdio_common_vfwprintf -@ stub _o___stdio_common_vfwprintf_p +@ cdecl _o___stdio_common_vfwprintf_p(int64 ptr wstr ptr ptr) __stdio_common_vfwprintf_p @ cdecl _o___stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) __stdio_common_vfwprintf_s @ cdecl _o___stdio_common_vfwscanf(int64 ptr wstr ptr ptr) __stdio_common_vfwscanf @ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) __stdio_common_vsnprintf_s

1 0

Sven Baars : gdi32: Remove some unreachable code (Coverity).
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 265a32aa1220949465989d9e77c177429faa0e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=265a32aa1220949465989d9e… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Apr 18 14:30:23 2021 +0200 gdi32: Remove some unreachable code (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b29d9fcc88e..456eb245700 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1701,8 +1701,6 @@ static void fontconfig_add_fonts_from_dir_list( FcConfig *config, FcStrList *dir } done: - if (font_set) pFcFontSetDestroy( font_set ); - if (subdir_list) pFcStrListDone( subdir_list ); if (subdir_set) pFcStrSetDestroy( subdir_set ); if (cache) pFcDirCacheUnload( cache ); }

1 0

Sven Baars : gdi32: Add a missing break (Coverity).
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 9cd656806215907f6e59121d1b8c612ab06d83bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cd656806215907f6e59121d… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Apr 18 14:30:24 2021 +0200 gdi32: Add a missing break (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/opentype.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 67af44dfe91..5a22f61cbd3 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -555,6 +555,7 @@ static LANGID get_name_record_langid( enum OPENTYPE_PLATFORM_ID platform, USHORT default: break; } + break; default: FIXME( "unknown platform %d\n", platform ); break;

1 0

Sven Baars : gdi32: Fix a leak on error path (Coverity).
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: bdfc865014d8622d54f262adbb40768f4767b0e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdfc865014d8622d54f262ad… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Apr 18 14:30:25 2021 +0200 gdi32: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 618a050a139..a82b34908e1 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1729,7 +1729,11 @@ static struct gdi_path *PATH_WidenPath(DC *dc) pStrokes = HeapAlloc(GetProcessHeap(), 0, sizeof(*pStrokes)); else pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(*pStrokes)); - if(!pStrokes) return NULL; + if(!pStrokes) + { + free_gdi_path(flat_path); + return NULL; + } pStrokes[numStrokes - 1] = alloc_gdi_path(0); /* fall through */ case PT_LINETO:

1 0

Sven Baars : gdi32: Fix some leaks on error paths.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 842b0d73385e78c8d5fb70d932ba73132800f34e URL: https://source.winehq.org/git/wine.git/?a=commit;h=842b0d73385e78c8d5fb70d9… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Apr 18 14:30:26 2021 +0200 gdi32: Fix some leaks on error paths. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bidi.c | 88 +++++++++++++++++++++++-------------------------------- 1 file changed, 36 insertions(+), 52 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 18971026395..8f3d31bf2ec 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -336,17 +336,17 @@ BOOL BIDI_Reorder( INT *cGlyphs /* [out] number of glyphs generated */ ) { - WORD *chartype; - BYTE *levels; + WORD *chartype = NULL; + BYTE *levels = NULL; INT i, done; unsigned glyph_i; - BOOL is_complex; + BOOL is_complex, ret = FALSE; int maxItems; int nItems; SCRIPT_CONTROL Control; SCRIPT_STATE State; - SCRIPT_ITEM *pItems; + SCRIPT_ITEM *pItems = NULL; HRESULT res; SCRIPT_CACHE psc = NULL; WORD *run_glyphs = NULL; @@ -429,8 +429,7 @@ BOOL BIDI_Reorder( if (!levels) { WARN("Out of memory\n"); - HeapFree(GetProcessHeap(), 0, chartype); - return FALSE; + goto cleanup; } maxItems = 5; @@ -438,9 +437,7 @@ BOOL BIDI_Reorder( if (!pItems) { WARN("Out of memory\n"); - HeapFree(GetProcessHeap(), 0, chartype); - HeapFree(GetProcessHeap(), 0, levels); - return FALSE; + goto cleanup; } if (lpGlyphs) @@ -450,31 +447,19 @@ BOOL BIDI_Reorder( if (!run_glyphs) { WARN("Out of memory\n"); - HeapFree(GetProcessHeap(), 0, chartype); - HeapFree(GetProcessHeap(), 0, levels); - HeapFree(GetProcessHeap(), 0, pItems); - return FALSE; + goto cleanup; } pwLogClust = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * uCount); if (!pwLogClust) { WARN("Out of memory\n"); - HeapFree(GetProcessHeap(), 0, chartype); - HeapFree(GetProcessHeap(), 0, levels); - HeapFree(GetProcessHeap(), 0, pItems); - HeapFree(GetProcessHeap(), 0, run_glyphs); - return FALSE; + goto cleanup; } psva = HeapAlloc(GetProcessHeap(),0,sizeof(SCRIPT_VISATTR) * uCount); if (!psva) { WARN("Out of memory\n"); - HeapFree(GetProcessHeap(), 0, chartype); - HeapFree(GetProcessHeap(), 0, levels); - HeapFree(GetProcessHeap(), 0, pItems); - HeapFree(GetProcessHeap(), 0, run_glyphs); - HeapFree(GetProcessHeap(), 0, pwLogClust); - return FALSE; + goto cleanup; } } @@ -519,18 +504,14 @@ BOOL BIDI_Reorder( res = ScriptItemize(lpString + done, i, maxItems, &Control, &State, pItems, &nItems); while (res == E_OUTOFMEMORY) { - maxItems = maxItems * 2; - pItems = HeapReAlloc(GetProcessHeap(), 0, pItems, sizeof(SCRIPT_ITEM) * maxItems); - if (!pItems) + SCRIPT_ITEM *new_pItems = HeapReAlloc(GetProcessHeap(), 0, pItems, sizeof(*pItems) * maxItems * 2); + if (!new_pItems) { WARN("Out of memory\n"); - HeapFree(GetProcessHeap(), 0, chartype); - HeapFree(GetProcessHeap(), 0, levels); - HeapFree(GetProcessHeap(), 0, run_glyphs); - HeapFree(GetProcessHeap(), 0, pwLogClust); - HeapFree(GetProcessHeap(), 0, psva); - return FALSE; + goto cleanup; } + pItems = new_pItems; + maxItems *= 2; res = ScriptItemize(lpString + done, i, maxItems, &Control, &State, pItems, &nItems); } @@ -587,12 +568,7 @@ BOOL BIDI_Reorder( WARN("Out of memory\n"); HeapFree(GetProcessHeap(), 0, runOrder); HeapFree(GetProcessHeap(), 0, visOrder); - HeapFree(GetProcessHeap(), 0, chartype); - HeapFree(GetProcessHeap(), 0, levels); - HeapFree(GetProcessHeap(), 0, pItems); - HeapFree(GetProcessHeap(), 0, psva); - HeapFree(GetProcessHeap(), 0, pwLogClust); - return FALSE; + goto cleanup; } for (j = 0; j < nItems; j++) @@ -611,23 +587,18 @@ BOOL BIDI_Reorder( res = ScriptShape(hDC, &psc, lpString + done + curItem->iCharPos, cChars, cMaxGlyphs, &curItem->a, run_glyphs, pwLogClust, psva, &cOutGlyphs); while (res == E_OUTOFMEMORY) { - cMaxGlyphs *= 2; - run_glyphs = HeapReAlloc(GetProcessHeap(), 0, run_glyphs, sizeof(WORD) * cMaxGlyphs); - if (!run_glyphs) + WORD *new_run_glyphs = HeapReAlloc(GetProcessHeap(), 0, run_glyphs, sizeof(*run_glyphs) * cMaxGlyphs * 2); + if (!new_run_glyphs) { WARN("Out of memory\n"); HeapFree(GetProcessHeap(), 0, runOrder); HeapFree(GetProcessHeap(), 0, visOrder); - HeapFree(GetProcessHeap(), 0, chartype); - HeapFree(GetProcessHeap(), 0, levels); - HeapFree(GetProcessHeap(), 0, pItems); - HeapFree(GetProcessHeap(), 0, psva); - HeapFree(GetProcessHeap(), 0, pwLogClust); HeapFree(GetProcessHeap(), 0, *lpGlyphs); - ScriptFreeCache(&psc); *lpGlyphs = NULL; - return FALSE; + goto cleanup; } + run_glyphs = new_run_glyphs; + cMaxGlyphs *= 2; res = ScriptShape(hDC, &psc, lpString + done + curItem->iCharPos, cChars, cMaxGlyphs, &curItem->a, run_glyphs, pwLogClust, psva, &cOutGlyphs); } if (res) @@ -643,10 +614,21 @@ BOOL BIDI_Reorder( } else { + WORD *new_glyphs; if (*lpGlyphs) - *lpGlyphs = HeapReAlloc(GetProcessHeap(), 0, *lpGlyphs, sizeof(WORD) * (glyph_i + cOutGlyphs)); + new_glyphs = HeapReAlloc(GetProcessHeap(), 0, *lpGlyphs, sizeof(**lpGlyphs) * (glyph_i + cOutGlyphs)); else - *lpGlyphs = HeapAlloc(GetProcessHeap(), 0, sizeof(WORD) * (glyph_i + cOutGlyphs)); + new_glyphs = HeapAlloc(GetProcessHeap(), 0, sizeof(**lpGlyphs) * (glyph_i + cOutGlyphs)); + if (!new_glyphs) + { + WARN("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, runOrder); + HeapFree(GetProcessHeap(), 0, visOrder); + HeapFree(GetProcessHeap(), 0, *lpGlyphs); + *lpGlyphs = NULL; + goto cleanup; + } + *lpGlyphs = new_glyphs; for (k = 0; k < cOutGlyphs; k++) (*lpGlyphs)[glyph_i+k] = run_glyphs[k]; glyph_i += cOutGlyphs; @@ -661,6 +643,8 @@ BOOL BIDI_Reorder( if (cGlyphs) *cGlyphs = glyph_i; + ret = TRUE; +cleanup: HeapFree(GetProcessHeap(), 0, chartype); HeapFree(GetProcessHeap(), 0, levels); HeapFree(GetProcessHeap(), 0, pItems); @@ -668,5 +652,5 @@ BOOL BIDI_Reorder( HeapFree(GetProcessHeap(), 0, pwLogClust); HeapFree(GetProcessHeap(), 0, psva); ScriptFreeCache(&psc); - return TRUE; + return ret; }

1 0

Alexandre Julliard : netapi32: Fix build when libnetapi is missing.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: e8d87a84533ce5fdf1ef47b72c6c8d2d195ef944 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8d87a84533ce5fdf1ef47b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 18 11:39:14 2021 +0200 netapi32: Fix build when libnetapi is missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/unixlib.c | 62 +++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 1506e616c06..6a8999a6de4 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -929,34 +929,6 @@ static void libnetapi_init(void) libnetapi_ctx = ctx; } -#else - -static NET_API_STATUS WINAPI server_getinfo( LMSTR servername, DWORD level, LPBYTE *bufptr ) -{ - return ERROR_NOT_SUPPORTED; -} - -static NET_API_STATUS WINAPI share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err ) -{ - return ERROR_NOT_SUPPORTED; -} - -static NET_API_STATUS WINAPI share_del( LMSTR servername, LMSTR netname, DWORD reserved ) -{ - return ERROR_NOT_SUPPORTED; -} - -static NET_API_STATUS WINAPI wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *bufptr ) -{ - return ERROR_NOT_SUPPORTED; -} - -static void libnetapi_init(void) -{ -} - -#endif /* SONAME_LIBNETAPI */ - static NET_API_STATUS WINAPI change_password( const WCHAR *domainname, const WCHAR *username, const WCHAR *oldpassword, const WCHAR *newpassword ) { @@ -1047,6 +1019,40 @@ end: return ret; } +#else + +static NET_API_STATUS WINAPI server_getinfo( const WCHAR *server, DWORD level, BYTE **buffer ) +{ + return ERROR_NOT_SUPPORTED; +} + +static NET_API_STATUS WINAPI share_add( const WCHAR *server, DWORD level, const BYTE *info, DWORD *err ) +{ + return ERROR_NOT_SUPPORTED; +} + +static NET_API_STATUS WINAPI share_del( const WCHAR *server, const WCHAR *share, DWORD reserved ) +{ + return ERROR_NOT_SUPPORTED; +} + +static NET_API_STATUS WINAPI wksta_getinfo( const WCHAR *server, DWORD level, BYTE **buffer ) +{ + return ERROR_NOT_SUPPORTED; +} + +static NET_API_STATUS WINAPI change_password( const WCHAR *domainname, const WCHAR *username, + const WCHAR *oldpassword, const WCHAR *newpassword ) +{ + return ERROR_NOT_SUPPORTED; +} + +static void libnetapi_init(void) +{ +} + +#endif /* SONAME_LIBNETAPI */ + static const struct samba_funcs samba_funcs = { server_getinfo,

1 0

Alexandre Julliard : ntdll: Support MaxVersionTested in the manifest compatibility element.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 2d519f5aa451513a6e12dec7855c08cd1b8d12fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d519f5aa451513a6e12dec7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 13:33:21 2021 +0200 ntdll: Support MaxVersionTested in the manifest compatibility element. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 85 +++++++++++++++++++++++++++++++++++--------- dlls/ntdll/actctx.c | 50 ++++++++++++++++++++++---- include/winnt.h | 1 + 3 files changed, 113 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d519f5aa451513a6e12…

1 0