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

Rémi Bernon : winewayland: Remove now unnecessary vulkan function name mapping.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: 6f122f48d3484f558ce8f2a5e26c586745136399 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f122f48d3484f558ce8f2a5e26c58… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 23 18:55:42 2024 +0100 winewayland: Remove now unnecessary vulkan function name mapping. --- dlls/winewayland.drv/vulkan.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 323563192ff..7a623c80713 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -189,16 +189,6 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo return VK_SUCCESS; } -static const char *wine_vk_host_fn_name(const char *name) -{ - if (!strcmp(name, "vkCreateWin32SurfaceKHR")) - return "vkCreateWaylandSurfaceKHR"; - if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) - return "vkGetPhysicalDeviceWaylandPresentationSupportKHR"; - - return name; -} - static void vk_result_update_out_of_date(VkResult *res) { /* If the current result is less severe than out_of_date, which for @@ -504,11 +494,6 @@ static void *wayland_vkGetDeviceProcAddr(VkDevice device, const char *name) TRACE("%p, %s\n", device, debugstr_a(name)); - /* Do not return the driver function if the corresponding host function - * is not available. */ - if (!pvkGetDeviceProcAddr(device, wine_vk_host_fn_name(name))) - return NULL; - if ((proc_addr = get_vulkan_driver_device_proc_addr(&vulkan_funcs, name))) return proc_addr; @@ -521,11 +506,6 @@ static void *wayland_vkGetInstanceProcAddr(VkInstance instance, const char *name TRACE("%p, %s\n", instance, debugstr_a(name)); - /* Do not return the driver function if the corresponding host function - * is not available. */ - if (!pvkGetInstanceProcAddr(instance, wine_vk_host_fn_name(name))) - return NULL; - if ((proc_addr = get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name))) return proc_addr;

1 0

Daniel Lehman : oleaut32: Implement GetSizeMax for BMPs.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: f4a91bcb8ac74754a40ea47155bfce5b446ad3b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4a91bcb8ac74754a40ea47155bfce… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 26 22:09:16 2024 -0800 oleaut32: Implement GetSizeMax for BMPs. --- dlls/oleaut32/olepicture.c | 117 +++++++++++++++++++++------------------ dlls/oleaut32/tests/olepicture.c | 2 - 2 files changed, 63 insertions(+), 56 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 6e0db65a101..78fd3fc5681 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1533,68 +1533,81 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) return hr; } -static BOOL serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLength) -{ - BOOL success = FALSE; - HDC hDC; - BITMAPINFO * pInfoBitmap; - int iNumPaletteEntries; - unsigned char * pPixelData; - BITMAPFILEHEADER * pFileHeader; - BITMAPINFO * pInfoHeader; - - pInfoBitmap = calloc(1, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); +/* pass NULL buffer to fetch size */ +static HRESULT serializeBMP(HBITMAP hbmp, void **buffer, unsigned int *length) +{ + char infobuf[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)] = { 0 }; + BITMAPINFO *info = (BITMAPINFO *)infobuf; + BITMAPINFO *bitmap; + BITMAPFILEHEADER *filehdr; + int numentries; + HDC hdc; + HRESULT hr = S_OK; + unsigned char *data = NULL; /* Find out bitmap size and padded length */ - hDC = GetDC(0); - pInfoBitmap->bmiHeader.biSize = sizeof(pInfoBitmap->bmiHeader); - GetDIBits(hDC, hBitmap, 0, 0, NULL, pInfoBitmap, DIB_RGB_COLORS); - - /* Fetch bitmap palette & pixel data */ - - pPixelData = calloc(1, pInfoBitmap->bmiHeader.biSizeImage); - GetDIBits(hDC, hBitmap, 0, pInfoBitmap->bmiHeader.biHeight, pPixelData, pInfoBitmap, DIB_RGB_COLORS); + hdc = GetDC(0); + info->bmiHeader.biSize = sizeof(info->bmiHeader); + if (!GetDIBits(hdc, hbmp, 0, 0, NULL, info, DIB_RGB_COLORS)) { + hr = E_INVALIDARG; + goto done; + } /* Calculate the total length required for the BMP data */ - if (pInfoBitmap->bmiHeader.biClrUsed != 0) { - iNumPaletteEntries = pInfoBitmap->bmiHeader.biClrUsed; - if (iNumPaletteEntries > 256) iNumPaletteEntries = 256; + if (info->bmiHeader.biClrUsed != 0) { + numentries = info->bmiHeader.biClrUsed; + if (numentries > 256) + numentries = 256; } else { - if (pInfoBitmap->bmiHeader.biBitCount <= 8) - iNumPaletteEntries = 1 << pInfoBitmap->bmiHeader.biBitCount; - else - iNumPaletteEntries = 0; + if (info->bmiHeader.biBitCount <= 8) + numentries = 1 << info->bmiHeader.biBitCount; + else + numentries = 0; } - *pLength = + + *length = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + - iNumPaletteEntries * sizeof(RGBQUAD) + - pInfoBitmap->bmiHeader.biSizeImage; - *ppBuffer = calloc(1, *pLength); + numentries * sizeof(RGBQUAD) + + info->bmiHeader.biSizeImage; + + if (!buffer) + goto done; + + /* Fetch bitmap palette & pixel data */ + if (!(data = malloc(info->bmiHeader.biSizeImage))) { + hr = E_OUTOFMEMORY; + goto done; + } + + if (!GetDIBits(hdc, hbmp, 0, info->bmiHeader.biHeight, data, info, DIB_RGB_COLORS)) { + hr = E_INVALIDARG; + goto done; + } + + if (!(*buffer = malloc(*length))) { + hr = E_OUTOFMEMORY; + goto done; + } /* Fill the BITMAPFILEHEADER */ - pFileHeader = *ppBuffer; - pFileHeader->bfType = BITMAP_FORMAT_BMP; - pFileHeader->bfSize = *pLength; - pFileHeader->bfOffBits = + filehdr = *buffer; + filehdr->bfType = BITMAP_FORMAT_BMP; + filehdr->bfSize = *length; + filehdr->bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + - iNumPaletteEntries * sizeof(RGBQUAD); + numentries * sizeof(RGBQUAD); /* Fill the BITMAPINFOHEADER and the palette data */ - pInfoHeader = (BITMAPINFO *)((unsigned char *)(*ppBuffer) + sizeof(BITMAPFILEHEADER)); - memcpy(pInfoHeader, pInfoBitmap, sizeof(BITMAPINFOHEADER) + iNumPaletteEntries * sizeof(RGBQUAD)); - memcpy( - (unsigned char *)(*ppBuffer) + - sizeof(BITMAPFILEHEADER) + - sizeof(BITMAPINFOHEADER) + - iNumPaletteEntries * sizeof(RGBQUAD), - pPixelData, pInfoBitmap->bmiHeader.biSizeImage); - success = TRUE; + bitmap = (BITMAPINFO *)((unsigned char *)(*buffer) + sizeof(BITMAPFILEHEADER)); + memcpy(bitmap, info, sizeof(BITMAPINFOHEADER) + numentries * sizeof(RGBQUAD)); + memcpy((unsigned char *)(*buffer) + filehdr->bfOffBits, data, bitmap->bmiHeader.biSizeImage); - free(pPixelData); - free(pInfoBitmap); - return success; +done: + free(data); + ReleaseDC(0, hdc); + return hr; } static BOOL serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) @@ -1755,7 +1768,6 @@ static HRESULT WINAPI OLEPictureImpl_Save( unsigned int iDataSize; DWORD header[2]; ULONG dummy; - BOOL serializeResult = FALSE; OLEPictureImpl *This = impl_from_IPersistStream(iface); TRACE("%p %p %d\n", This, pStm, fClearDirty); @@ -1789,7 +1801,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( if (This->bIsDirty || !This->data) { switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) { case BITMAP_FORMAT_BMP: - serializeResult = serializeBMP(This->desc.bmp.hbitmap, &pIconData, &iDataSize); + hResult = serializeBMP(This->desc.bmp.hbitmap, &pIconData, &iDataSize); break; case BITMAP_FORMAT_JPEG: FIXME("(%p,%p,%d), PICTYPE_BITMAP (format JPEG) not implemented!\n",This,pStm,fClearDirty); @@ -1805,11 +1817,8 @@ static HRESULT WINAPI OLEPictureImpl_Save( break; } - if (!serializeResult) - { - hResult = E_FAIL; + if (hResult != S_OK) break; - } free(This->data); This->data = pIconData; @@ -1858,7 +1867,7 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax(IPersistStream *iface, ULARGE_IN if (This->bIsDirty || !This->data) { switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) { case BITMAP_FORMAT_BMP: - FIXME("(%p), PICTYPE_BITMAP (format BMP) not implemented!\n",This); + hr = serializeBMP(This->desc.bmp.hbitmap, NULL, &datasize); break; case BITMAP_FORMAT_JPEG: FIXME("(%p), PICTYPE_BITMAP (format JPEG) not implemented!\n",This); diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index a269491fd3f..0384a43967b 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1254,9 +1254,7 @@ static void test_load_save_bmp(void) maxsize.QuadPart = 0; hr = IPersistStream_GetSizeMax(src_stream, &maxsize); - todo_wine ok(hr == S_OK, "GetSizeMax error %#lx\n", hr); - todo_wine ok(maxsize.QuadPart == 74, "expected 74, got %s\n", wine_dbgstr_longlong(maxsize.QuadPart)); hr = IPersistStream_Save(src_stream, dst_stream, TRUE);

1 0

Rémi Bernon : winex11: Remove now unnecessary vulkan function name mapping.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: 2b25f51e0d7d4187867e9011e9972848a5ba5a67 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b25f51e0d7d4187867e9011e99728… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 23 18:46:30 2024 +0100 winex11: Remove now unnecessary vulkan function name mapping. --- dlls/winex11.drv/vulkan.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index e8bcc09e3e2..c7da02ad681 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -433,24 +433,12 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ return res; } -static const char *wine_vk_host_fn_name( const char *name ) -{ - if (!strcmp(name, "vkCreateWin32SurfaceKHR")) - return "vkCreateXlibSurfaceKHR"; - if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) - return "vkGetPhysicalDeviceXlibPresentationSupportKHR"; - - return name; -} - static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) { void *proc_addr; TRACE("%p, %s\n", device, debugstr_a(name)); - if (!pvkGetDeviceProcAddr( device, wine_vk_host_fn_name( name ) )) return NULL; - if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) return proc_addr; @@ -463,8 +451,6 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); - if (!pvkGetInstanceProcAddr( instance, wine_vk_host_fn_name( name ) )) return NULL; - if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) return proc_addr;

1 0

Rémi Bernon : winevulkan: Succeed VK_KHR_win32_surface procs queries when enabled.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: f3d3b86668f87c22a085f2fe0153668c80d3500d URL: https://gitlab.winehq.org/wine/wine/-/commit/f3d3b86668f87c22a085f2fe015366… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 23 18:46:30 2024 +0100 winevulkan: Succeed VK_KHR_win32_surface procs queries when enabled. --- dlls/winevulkan/vulkan.c | 10 ++++++++++ dlls/winevulkan/vulkan_private.h | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 0a6224476e2..c8cb525929d 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -617,6 +617,10 @@ static VkResult wine_vk_instance_convert_create_info(struct conversion_context * { object->enable_wrapper_list = VK_TRUE; } + if (!strcmp(extension_name, "VK_KHR_win32_surface")) + { + object->enable_win32_surface = VK_TRUE; + } } if (use_external_memory()) @@ -2285,6 +2289,12 @@ NTSTATUS vk_is_available_instance_function(void *arg) { struct is_available_instance_function_params *params = arg; struct wine_instance *instance = wine_instance_from_handle(params->instance); + + if (!strcmp(params->name, "vkCreateWin32SurfaceKHR")) + return instance->enable_win32_surface; + if (!strcmp(params->name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) + return instance->enable_win32_surface; + return !!vk_funcs->p_vkGetInstanceProcAddr(instance->host_instance, params->name); } diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 1697298a3d0..94eecc5e5d5 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -99,6 +99,7 @@ struct wine_instance struct wine_phys_dev **phys_devs; uint32_t phys_dev_count; + VkBool32 enable_win32_surface; VkBool32 enable_wrapper_list; struct list wrappers; pthread_rwlock_t wrapper_lock;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: e5085327ffee8c37b2f88dd524cd8554e862cda4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5085327ffee8c37b2f88dd524cd85… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Mar 1 00:38:29 2024 +0200 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 5736de36ea4..a6d4d9db987 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2024-02-20 00:47+0200\n" +"PO-Revision-Date: 2024-03-01 00:38+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10146,7 +10146,7 @@ msgstr "Valdymo skydelis" #: dlls/shell32/shell32.rc:161 msgid "Ne&w" -msgstr "" +msgstr "Na&ujas" #: dlls/shell32/shell32.rc:163 msgid "E&xplore"

1 0