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

Paul Gofman : comctl32: Force debug info in critical sections.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: a7d3d574c0a390789eb5759f53507cb4cf3fd7c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7d3d574c0a390789eb5759f53507c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 29 20:57:32 2024 -0600 comctl32: Force debug info in critical sections. --- dlls/comctl32/animate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 721379f329c..46e1e37b72d 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -813,7 +813,7 @@ static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs) TRACE("Animate style %#lx, parent %p\n", infoPtr->dwStyle, infoPtr->hwndNotify); - InitializeCriticalSection(&infoPtr->cs); + InitializeCriticalSectionEx(&infoPtr->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); infoPtr->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ANIMATE_INFO*->cs"); return TRUE;

1 0

Paul Gofman : mcicda: Force debug info in critical sections.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: e02b3379eb92d6a76669cfa4c7ce55225194b275 URL: https://gitlab.winehq.org/wine/wine/-/commit/e02b3379eb92d6a76669cfa4c7ce55… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 29 20:58:55 2024 -0600 mcicda: Force debug info in critical sections. --- dlls/mcicda/mcicda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 2f6eaaadc58..59acbcb6d4c 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -201,7 +201,7 @@ static DWORD MCICDA_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) mciSetDriverData(wmcda->wDevID, (DWORD_PTR)wmcda); modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; modp->wType = MCI_DEVTYPE_CD_AUDIO; - InitializeCriticalSection(&wmcda->cs); + InitializeCriticalSectionEx(&wmcda->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); wmcda->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCICDAUDIO.cs"); return modp->wDeviceID; }

1 0

Paul Gofman : ole32: Force debug info in critical sections.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 6e1e52cbc3c85b4159fb3c4d5b98d7556b44d03a URL: https://gitlab.winehq.org/wine/wine/-/commit/6e1e52cbc3c85b4159fb3c4d5b98d7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 29 21:00:07 2024 -0600 ole32: Force debug info in critical sections. --- dlls/ole32/stg_prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 66b12f3ae9e..7481f0f3480 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2513,7 +2513,7 @@ static HRESULT PropertyStorage_BaseConstruct(IStream *stm, (*pps)->IPropertyStorage_iface.lpVtbl = &IPropertyStorage_Vtbl; (*pps)->ref = 1; - InitializeCriticalSection(&(*pps)->cs); + InitializeCriticalSectionEx(&(*pps)->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); (*pps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PropertyStorage_impl.cs"); (*pps)->stm = stm; (*pps)->fmtid = *rfmtid;

1 0

Paul Gofman : qcap: Force debug info in critical sections.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 02b68a0ac118fcfe701e76d24b61bca9ece79b2f URL: https://gitlab.winehq.org/wine/wine/-/commit/02b68a0ac118fcfe701e76d24b61bc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 29 21:01:23 2024 -0600 qcap: Force debug info in critical sections. --- dlls/qcap/audiorecord.c | 2 +- dlls/qcap/capturegraph.c | 2 +- dlls/qcap/vfwcapture.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 775d942f8f8..b65d1c69f90 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -824,7 +824,7 @@ HRESULT audio_record_create(IUnknown *outer, IUnknown **out) object->state = State_Stopped; InitializeConditionVariable(&object->state_cv); - InitializeCriticalSection(&object->state_cs); + InitializeCriticalSectionEx(&object->state_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->state_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": audio_record.state_cs"); TRACE("Created audio recorder %p.\n", object); diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 45cef802ba2..d570ac334d3 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -62,7 +62,7 @@ HRESULT capture_graph_create(IUnknown *outer, IUnknown **out) object->ICaptureGraphBuilder_iface.lpVtbl = &builder_Vtbl; object->ref = 1; object->mygraph = NULL; - InitializeCriticalSection(&object->csFilter); + InitializeCriticalSectionEx(&object->csFilter, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CaptureGraphImpl.csFilter"); TRACE("Created capture graph builder %p.\n", object); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index a51b39c0a11..0899b228ec2 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -904,7 +904,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) object->state = State_Stopped; InitializeConditionVariable(&object->state_cv); - InitializeCriticalSection(&object->state_cs); + InitializeCriticalSectionEx(&object->state_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->state_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": vfw_capture.state_cs"); TRACE("Created VFW capture filter %p.\n", object);

1 0

Esme Povirk : gdiplus: Fix use after free in GdipAddPathString.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 3ca8204837ffa56064c61981fcb5128981f17196 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ca8204837ffa56064c61981fcb512… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Mar 1 18:54:33 2024 +0000 gdiplus: Fix use after free in GdipAddPathString. --- dlls/gdiplus/graphicspath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 23a9be25055..ea9c247b38c 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1141,7 +1141,6 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT } get_log_fontW(font, graphics, &lfw); - GdipDeleteGraphics(graphics); hfont = CreateFontIndirectW(&lfw); if (!hfont) @@ -1167,6 +1166,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT DeleteDC(dc); DeleteObject(hfont); GdipDeleteFont(font); + GdipDeleteGraphics(graphics); if (status != Ok) /* free backup */ {

1 0

Esme Povirk : gdiplus: Implement font linking in GdipAddPathString.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 55f71fd846423338e2029cdce3714903e601bb8e URL: https://gitlab.winehq.org/wine/wine/-/commit/55f71fd846423338e2029cdce37149… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Mar 1 19:27:30 2024 +0000 gdiplus: Implement font linking in GdipAddPathString. --- dlls/gdiplus/gdiplus_private.h | 4 ++++ dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/graphicspath.c | 25 +++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1ae03d7126e..0b302a405ea 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -127,6 +127,10 @@ extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, REAL tension, REAL *x, REAL *y); +extern void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, + GDIPCONST GpStringFormat *format, HFONT *hfont, + LOGFONTW *lfw_return, GDIPCONST GpMatrix *matrix); + extern void free_installed_fonts(void); extern BOOL lengthen_path(GpPath *path, INT len); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 85b25e1ac24..0727b63ed4f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2296,7 +2296,7 @@ void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) lstrcpyW(lf->lfFaceName, font->family->FamilyName); } -static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, +void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, GDIPCONST GpStringFormat *format, HFONT *hfont, LOGFONTW *lfw_return, GDIPCONST GpMatrix *matrix) { diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index ea9c247b38c..662e20071aa 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1001,6 +1001,9 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info) { static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; struct format_string_args *args = info->user_data; + struct gdip_font_link_section *section = LIST_ENTRY(list_head(&info->font_link_info.sections), struct gdip_font_link_section, entry); + HFONT hfont = NULL, oldhfont = NULL; + int section_start = -1; GpPath *path = args->path; GpStatus status = Ok; float x = info->rect->X + (info->bounds->X - info->rect->X) * args->scale; @@ -1019,6 +1022,22 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info) TTPOLYGONHEADER *ph = NULL, *origph; char *start; DWORD len, ofs = 0; + + while (i >= section->end) + section = LIST_ENTRY(list_next(&info->font_link_info.sections, &section->entry), struct gdip_font_link_section, entry); + + if (section_start != section->start) + { + if (hfont) + { + SelectObject(info->hdc, oldhfont); + DeleteObject(hfont); + } + get_font_hfont(info->graphics, section->font, NULL, &hfont, NULL, NULL); + oldhfont = SelectObject(info->hdc, hfont); + section_start = section->start; + } + len = GetGlyphOutlineW(info->hdc, info->string[i], GGO_BEZIER, &gm, 0, NULL, &identity); if (len == GDI_ERROR) { @@ -1085,6 +1104,12 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info) break; } + if (hfont) + { + SelectObject(info->hdc, oldhfont); + DeleteObject(hfont); + } + return status; }

1 0

Tim Clem : winemac.drv: Exclude the emoji Touch Bar when looking for input methods.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 93bc97e54f568f89b1b9bba092e37ff5dba972b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/93bc97e54f568f89b1b9bba092e37f… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Mar 1 13:08:51 2024 -0800 winemac.drv: Exclude the emoji Touch Bar when looking for input methods. Fixes weird keyboard behavior on MacBooks with the Touch Bar. --- dlls/winemac.drv/cocoa_app.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index de3a23a5d2d..f6a9cd145ea 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2075,6 +2075,8 @@ static NSString* WineLocalizedString(unsigned int stringID) CFSTR("com.apple.inputmethod.AssistiveControl"), /* The popup for accented characters when you hold down a key. */ CFSTR("com.apple.PressAndHold"), + /* Emoji list on MacBooks with the Touch Bar. */ + CFSTR("com.apple.inputmethod.EmojiFunctionRowItem"), }; CFStringRef sourceID = TISGetInputSourceProperty(inputSource, kTISPropertyInputSourceID);

1 0

Tim Clem : win32u: Don't mask keyboard scan codes when processing them for IME.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 0fb7c99c33507ac494c9c35e15fb6df8b000cdd2 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fb7c99c33507ac494c9c35e15fb6d… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Mar 1 13:10:26 2024 -0800 win32u: Don't mask keyboard scan codes when processing them for IME. Fixes missed key up events on older macOS versions, which could result in out-of-order input. Fix via Rémi Bernon <rbernon(a)codeweavers.com>. --- dlls/win32u/imm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index d1dc1de8c55..4a9aca22360 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -583,7 +583,7 @@ LRESULT ime_driver_call( HWND hwnd, enum wine_ime_call call, WPARAM wparam, LPAR { struct imm_thread_data *data = get_imm_thread_data(); - data->ime_process_scan = HIWORD(lparam) & 0x1ff; + data->ime_process_scan = HIWORD(lparam); data->ime_process_vkey = LOWORD(wparam); res = user_driver->pImeProcessKey( params->himc, wparam, lparam, params->state ); data->ime_process_vkey = data->ime_process_scan = 0; @@ -597,7 +597,7 @@ LRESULT ime_driver_call( HWND hwnd, enum wine_ime_call call, WPARAM wparam, LPAR res = TRUE; } - TRACE( "processing scan %#x, vkey %#x -> %u\n", LOWORD(wparam), HIWORD(lparam) & 0x1ff, (UINT)res ); + TRACE( "processing scan %#x, vkey %#x -> %u\n", LOWORD(wparam), HIWORD(lparam), (UINT)res ); return res; } case WINE_IME_TO_ASCII_EX:

1 0

Daniel Lehman : oleaut32: Implement GetSizeMax for BMPs.
by Alexandre Julliard 01 Mar '24

01 Mar '24

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 : winevulkan: Succeed VK_KHR_win32_surface procs queries when enabled.
by Alexandre Julliard 01 Mar '24

01 Mar '24

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