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

Jacek Caban : winevulkan: Don't use vulkan_private.h in loader_thunks.c.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 171fe51b794f51b8d2b3811b7327aa2e730cd07e URL: https://source.winehq.org/git/wine.git/?a=commit;h=171fe51b794f51b8d2b3811b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 19 14:14:59 2021 +0200 winevulkan: Don't use vulkan_private.h in loader_thunks.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 2 +- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_loader.h | 43 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 19 +----------------- 4 files changed, 46 insertions(+), 20 deletions(-) diff --git a/dlls/winevulkan/loader_thunks.c b/dlls/winevulkan/loader_thunks.c index d05429f4116..22497545b0b 100644 --- a/dlls/winevulkan/loader_thunks.c +++ b/dlls/winevulkan/loader_thunks.c @@ -9,7 +9,7 @@ * */ -#include "vulkan_private.h" +#include "vulkan_loader.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ef24cbfd262..100d233bc51 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2501,7 +2501,7 @@ class VkGenerator(object): def generate_loader_thunks_c(self, f, prefix): self._generate_copyright(f) - f.write("#include \"vulkan_private.h\"\n\n") + f.write("#include \"vulkan_loader.h\"\n\n") f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h new file mode 100644 index 00000000000..61b2d60c272 --- /dev/null +++ b/dlls/winevulkan/vulkan_loader.h @@ -0,0 +1,43 @@ +/* Wine Vulkan ICD private data structures + * + * Copyright 2017 Roderick Colenbrander + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_VULKAN_LOADER_H +#define __WINE_VULKAN_LOADER_H + +#include "wine/debug.h" + +#define VK_NO_PROTOTYPES +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h" + +#include "loader_thunks.h" + +struct vulkan_func +{ + const char *name; + void *func; +}; + +void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; +void *wine_vk_get_phys_dev_proc_addr(const char *name) DECLSPEC_HIDDEN; +void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; + +extern const struct unix_funcs *unix_funcs; + +#endif /* __WINE_VULKAN_LOADER_H */ diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index f06e739c423..4e9c0721dcd 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -27,14 +27,10 @@ #include <pthread.h> -#include "wine/debug.h" #include "wine/list.h" -#define VK_NO_PROTOTYPES -#include "wine/vulkan.h" -#include "wine/vulkan_driver.h" +#include "vulkan_loader.h" #include "vulkan_thunks.h" -#include "loader_thunks.h" /* Magic value defined by Vulkan ICD / Loader spec */ #define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE @@ -43,12 +39,6 @@ #define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 #define WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS 0x00000004 -struct vulkan_func -{ - const char *name; - void *func; -}; - /* Base 'class' for our Vulkan dispatchable objects such as VkDevice and VkInstance. * This structure MUST be the first element of a dispatchable object as the ICD * loader depends on it. For now only contains loader_magic, but over time more common @@ -235,10 +225,6 @@ static inline VkSurfaceKHR wine_surface_to_handle(struct wine_surface *surface) return (VkSurfaceKHR)(uintptr_t)surface; } -void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; -void *wine_vk_get_phys_dev_proc_addr(const char *name) DECLSPEC_HIDDEN; -void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; - BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; @@ -246,8 +232,5 @@ BOOL wine_vk_is_type_wrapped(VkObjectType type) DECLSPEC_HIDDEN; uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) DECLSPEC_HIDDEN; extern const struct unix_funcs loader_funcs; -extern const struct unix_funcs *unix_funcs; - -const struct unix_funcs *unix_vk_init(const struct vulkan_funcs *driver) DECLSPEC_HIDDEN; #endif /* __WINE_VULKAN_PRIVATE_H */

1 0

Sven Baars : gdi32: Fix some leaks on error paths.
by Alexandre Julliard April 19, 2021

April 19, 2021

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

Sven Baars : gdi32: Add a missing break (Coverity).
by Alexandre Julliard April 19, 2021

April 19, 2021

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

Jacek Caban : winevulkan: Don't use vulkan_private.h in loader.c.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: bd5408493a642623455c3146064880f475a2150d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd5408493a642623455c3146… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 19 14:15:10 2021 +0200 winevulkan: Don't use vulkan_private.h in loader.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 4 ++-- dlls/winevulkan/vulkan.c | 4 ++-- dlls/winevulkan/vulkan_loader.h | 26 ++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 24 +----------------------- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 769724fe20d..5f5664db3fa 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -28,7 +28,7 @@ #include "devguid.h" #include "setupapi.h" -#include "vulkan_private.h" +#include "vulkan_loader.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); @@ -159,7 +159,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * * https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/2323 * https://github.com/KhronosGroup/Vulkan-Docs/issues/655 */ - if (device->quirks & WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR + if (((struct wine_vk_device_base *)device)->quirks & WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR && ((func = wine_vk_get_instance_proc_addr(name)) || (func = wine_vk_get_phys_dev_proc_addr(name)))) { diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 1070ccec115..d6f501b267a 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -768,7 +768,7 @@ VkResult WINAPI unix_vkCreateDevice(VkPhysicalDevice phys_dev, if (!(object = calloc(1, sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY; - object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + object->base.base.loader_magic = VULKAN_ICD_MAGIC_VALUE; object->phys_dev = phys_dev; res = wine_vk_device_convert_create_info(create_info, &create_info_host); @@ -823,7 +823,7 @@ VkResult WINAPI unix_vkCreateDevice(VkPhysicalDevice phys_dev, next_queue += queue_count; } - object->quirks = phys_dev->instance->quirks; + object->base.quirks = phys_dev->instance->quirks; *device = object; TRACE("Created device %p (native device %p).\n", object, object->device); diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index 61b2d60c272..d248ff6521f 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -28,6 +28,32 @@ #include "loader_thunks.h" +/* Magic value defined by Vulkan ICD / Loader spec */ +#define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE + +#define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 +#define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 +#define WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS 0x00000004 + +/* Base 'class' for our Vulkan dispatchable objects such as VkDevice and VkInstance. + * This structure MUST be the first element of a dispatchable object as the ICD + * loader depends on it. For now only contains loader_magic, but over time more common + * functionality is expected. + */ +struct wine_vk_base +{ + /* Special section in each dispatchable object for use by the ICD loader for + * storing dispatch tables. The start contains a magical value '0x01CDC0DE'. + */ + UINT_PTR loader_magic; +}; + +struct wine_vk_device_base +{ + struct wine_vk_base base; + unsigned int quirks; +}; + struct vulkan_func { const char *name; diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 4e9c0721dcd..ebc1b35ba44 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -32,26 +32,6 @@ #include "vulkan_loader.h" #include "vulkan_thunks.h" -/* Magic value defined by Vulkan ICD / Loader spec */ -#define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE - -#define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 -#define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 -#define WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS 0x00000004 - -/* Base 'class' for our Vulkan dispatchable objects such as VkDevice and VkInstance. - * This structure MUST be the first element of a dispatchable object as the ICD - * loader depends on it. For now only contains loader_magic, but over time more common - * functionality is expected. - */ -struct wine_vk_base -{ - /* Special section in each dispatchable object for use by the ICD loader for - * storing dispatch tables. The start contains a magical value '0x01CDC0DE'. - */ - UINT_PTR loader_magic; -}; - /* Some extensions have callbacks for those we need to be able to * get the wine wrapper for a native handle */ @@ -74,7 +54,7 @@ struct VkCommandBuffer_T struct VkDevice_T { - struct wine_vk_base base; + struct wine_vk_device_base base; struct vulkan_device_funcs funcs; struct VkPhysicalDevice_T *phys_dev; /* parent */ VkDevice device; /* native device */ @@ -82,8 +62,6 @@ struct VkDevice_T struct VkQueue_T* queues; uint32_t queue_count; - unsigned int quirks; - struct wine_vk_mapping mapping; };

1 0

Nikolay Sivov : evr/presenter: Fix sample queue loop present condition.
by Alexandre Julliard April 19, 2021

April 19, 2021

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: Set sample size attributes when configuring mixer output.
by Alexandre Julliard April 19, 2021

April 19, 2021

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

Hans Leidekker : wldap32: Build with msvcrt.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: e5f1c0f7fc0fb5fa550756fc71398c9a71906d62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5f1c0f7fc0fb5fa550756fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 10:04:51 2021 +0200 wldap32: Build with msvcrt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/Makefile.in | 2 ++ dlls/wldap32/libldap.h | 10 +++++----- dlls/wldap32/page.c | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in index 18a37151f99..831c00d65e1 100644 --- a/dlls/wldap32/Makefile.in +++ b/dlls/wldap32/Makefile.in @@ -4,6 +4,8 @@ IMPORTS = user32 EXTRAINCL = $(LDAP_CFLAGS) EXTRALIBS = $(LDAP_LIBS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ add.c \ ber.c \ diff --git a/dlls/wldap32/libldap.h b/dlls/wldap32/libldap.h index 1dfadf7e3bc..cc247e8fd82 100644 --- a/dlls/wldap32/libldap.h +++ b/dlls/wldap32/libldap.h @@ -19,8 +19,8 @@ /* compatible with structures defined in ldap.h */ typedef struct bervalU { - unsigned long bv_len; - char *bv_val; + ULONG_PTR bv_len; + char *bv_val; } BerValueU; typedef struct @@ -79,8 +79,8 @@ typedef struct typedef struct timevalU { - unsigned long tv_sec; - unsigned long tv_usec; + LONG_PTR tv_sec; + LONG_PTR tv_usec; } LDAP_TIMEVALU; #ifndef SASL_CB_LIST_END @@ -92,7 +92,7 @@ typedef struct timevalU typedef struct sasl_interactU { - unsigned long id; + ULONG_PTR id; const char *challenge; const char *prompt; const char *defresult; diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 5364280f271..49be2203b3f 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -245,7 +245,7 @@ ULONG CDECL ldap_parse_page_controlW( WLDAP32_LDAP *ld, LDAPControlW **ctrls, UL for (i = 0; ctrls[i]; i++) { - if (!lstrcmpW( LDAP_PAGED_RESULT_OID_STRING_W, ctrls[i]->ldctl_oid )) + if (!wcscmp( LDAP_PAGED_RESULT_OID_STRING_W, ctrls[i]->ldctl_oid )) control = ctrls[i]; } if (!control) return WLDAP32_LDAP_CONTROL_NOT_FOUND;

1 0

Nikolay Sivov : mf/evr: Set initial output window size for the presenter.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 0dbbe8da25be1b828aa4babb89fc45a9de1aa9de URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dbbe8da25be1b828aa4babb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 19 16:02:01 2021 +0300 mf/evr: Set initial output window size for the presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 +- dlls/mf/evr.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index f60e337b386..e56d4c04a84 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,7 +1,7 @@ MODULE = mf.dll IMPORTLIB = mf IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids -DELAYIMPORTS = evr +DELAYIMPORTS = evr user32 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 9cb6763da4e..79e2f57f9c5 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1611,11 +1611,15 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) static HRESULT video_renderer_configure_presenter(struct video_renderer *renderer) { IMFVideoDisplayControl *control; + RECT rect = { 0 }; HRESULT hr; if (SUCCEEDED(IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFVideoDisplayControl, (void **)&control))) { - IMFVideoDisplayControl_SetVideoWindow(control, renderer->window); + GetClientRect(renderer->window, &rect); + + if (SUCCEEDED(hr = IMFVideoDisplayControl_SetVideoWindow(control, renderer->window))) + hr = IMFVideoDisplayControl_SetVideoPosition(control, NULL, &rect); IMFVideoDisplayControl_Release(control); }

1 0

Hans Leidekker : wldap32: Move support for parse functions to the Unix library.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 274e3991213d7c65c4a7e0fc4a0228d563fd7de2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=274e3991213d7c65c4a7e0fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 10:04:47 2021 +0200 wldap32: Move support for parse functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/libldap.c | 32 +++++ dlls/wldap32/libldap.h | 11 ++ dlls/wldap32/parse.c | 286 +++++++++++++++++------------------------ dlls/wldap32/winldap_private.h | 40 ++++++ 4 files changed, 199 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=274e3991213d7c65c4a7…

1 0

Alexandre Julliard : ntdll: Support MaxVersionTested in the manifest compatibility element.
by Alexandre Julliard April 19, 2021

April 19, 2021

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