May 2023 - Wine-commits - list.winehq.org

Piotr Caban : wineps: Use printer DC in print processor.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: d98cd8d28bc40c808a4058e8af4afac75fe63390 URL: https://gitlab.winehq.org/wine/wine/-/commit/d98cd8d28bc40c808a4058e8af4afa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 6 11:17:02 2023 +0200 wineps: Use printer DC in print processor. --- dlls/wineps.drv/builtin.c | 43 --------------- dlls/wineps.drv/printproc.c | 131 ++------------------------------------------ dlls/wineps.drv/psdrv.h | 2 - 3 files changed, 4 insertions(+), 172 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 270ce1bef8a..74ffda36f92 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -258,24 +258,6 @@ BOOL PSDRV_WriteBuiltinGlyphShow(PHYSDEV dev, LPCWSTR str, INT count) return TRUE; } -/*********************************************************************** - * PSDRV_GetTextMetrics - */ -BOOL CDECL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) -{ - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - - if (physDev->font.fontloc == Download) - { - dev = GET_NEXT_PHYSDEV( dev, pGetTextMetrics ); - return dev->funcs->pGetTextMetrics( dev, metrics ); - } - - memcpy(metrics, &(physDev->font.fontinfo.Builtin.tm), - sizeof(physDev->font.fontinfo.Builtin.tm)); - return TRUE; -} - /****************************************************************************** * PSDRV_UVMetrics * @@ -314,28 +296,3 @@ const AFMMETRICS *PSDRV_UVMetrics(LONG UV, const AFM *afm) return needle; } - -/*********************************************************************** - * PSDRV_GetTextExtentExPoint - */ -BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT alpDx) -{ - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - int i; - float width = 0.0; - - if (physDev->font.fontloc == Download) - { - dev = GET_NEXT_PHYSDEV( dev, pGetTextExtentExPoint ); - return dev->funcs->pGetTextExtentExPoint( dev, str, count, alpDx ); - } - - TRACE("%s %i\n", debugstr_wn(str, count), count); - - for (i = 0; i < count; ++i) - { - width += PSDRV_UVMetrics(str[i], physDev->font.fontinfo.Builtin.afm)->WX; - alpDx[i] = width * physDev->font.fontinfo.Builtin.scale; - } - return TRUE; -} diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 417766d4093..a58a23a281b 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -155,17 +155,6 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } -static BOOL CDECL font_GetTextExtentExPoint(PHYSDEV dev, const WCHAR *str, INT count, INT *dxs) -{ - SIZE size; - return GetTextExtentExPointW(dev->hdc, str, count, -1, NULL, dxs, &size); -} - -static BOOL CDECL font_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) -{ - return GetTextMetricsW(dev->hdc, metrics); -} - static HFONT CDECL font_SelectFont(PHYSDEV dev, HFONT hfont, UINT *aa_flags) { HFONT tt_font, old_font; @@ -187,8 +176,6 @@ static HFONT CDECL font_SelectFont(PHYSDEV dev, HFONT hfont, UINT *aa_flags) static const struct gdi_dc_funcs font_funcs = { - .pGetTextExtentExPoint = font_GetTextExtentExPoint, - .pGetTextMetrics = font_GetTextMetrics, .pSelectFont = font_SelectFont, .priority = GDI_PRIORITY_FONT_DRV }; @@ -1151,38 +1138,9 @@ static BOOL select_hbrush(struct pp_data *data, HANDLETABLE *htable, int handle_ return PSDRV_SelectBrush(&data->pdev->dev, brush, pattern) != NULL; } -/* Performs a device to world transformation on the specified width (which - * is in integer format). - */ -static inline INT INTERNAL_XDSTOWS(HDC hdc, INT width) -{ - double floatWidth; - XFORM xform; - - GetWorldTransform(hdc, &xform); - - /* Perform operation with floating point */ - floatWidth = (double)width * xform.eM11; - /* Round to integers */ - return GDI_ROUND(floatWidth); -} - /* Performs a device to world transformation on the specified size (which * is in integer format). */ -static inline INT INTERNAL_YDSTOWS(HDC hdc, INT height) -{ - double floatHeight; - XFORM xform; - - GetWorldTransform(hdc, &xform); - - /* Perform operation with floating point */ - floatHeight = (double)height * xform.eM22; - /* Round to integers */ - return GDI_ROUND(floatHeight); -} - static inline INT INTERNAL_YWSTODS(HDC hdc, INT height) { POINT pt[2]; @@ -1193,87 +1151,6 @@ static inline INT INTERNAL_YWSTODS(HDC hdc, INT height) return pt[1].y - pt[0].y; } -/* compute positions for text rendering, in device coords */ -static BOOL get_char_positions(struct pp_data *data, const WCHAR *str, - INT count, INT *dx, SIZE *size) -{ - TEXTMETRICW tm; - - size->cx = size->cy = 0; - if (!count) return TRUE; - - PSDRV_GetTextMetrics(&data->pdev->dev, &tm); - if (!PSDRV_GetTextExtentExPoint(&data->pdev->dev, str, count, dx)) return FALSE; - - if (data->break_extra || data->break_rem) - { - int i, space = 0, rem = data->break_rem; - - for (i = 0; i < count; i++) - { - if (str[i] == tm.tmBreakChar) - { - space += data->break_extra; - if (rem > 0) - { - space++; - rem--; - } - } - dx[i] += space; - } - } - size->cx = dx[count - 1]; - size->cy = tm.tmHeight; - return TRUE; -} - -static BOOL get_text_extent(struct pp_data *data, const WCHAR *str, INT count, - INT max_ext, INT *nfit, INT *dxs, SIZE *size, UINT flags) -{ - INT buffer[256], *pos = dxs; - int i, char_extra; - BOOL ret; - - if (flags) - return GetTextExtentExPointI(data->pdev->dev.hdc, str, count, max_ext, nfit, dxs, size); - else if (data->pdev->font.fontloc == Download) - return GetTextExtentExPointW(data->pdev->dev.hdc, str, count, max_ext, nfit, dxs, size); - - if (!dxs) - { - pos = buffer; - if (count > 256 && !(pos = malloc(count * sizeof(*pos)))) - return FALSE; - } - - if ((ret = get_char_positions(data, str, count, pos, size))) - { - char_extra = GetTextCharacterExtra(data->pdev->dev.hdc); - if (dxs || nfit) - { - for (i = 0; i < count; i++) - { - unsigned int dx = abs(INTERNAL_XDSTOWS(data->pdev->dev.hdc, pos[i])) - + (i + 1) * char_extra; - if (nfit && dx > (unsigned int)max_ext) break; - if (dxs) dxs[i] = dx; - } - if (nfit) *nfit = i; - } - - size->cx = abs(INTERNAL_XDSTOWS(data->pdev->dev.hdc, size->cx)) - + count * char_extra; - size->cy = abs(INTERNAL_YDSTOWS(data->pdev->dev.hdc, size->cy)); - } - - if (pos != buffer && pos != dxs) free(pos); - - TRACE("(%s, %d) returning %dx%d\n", debugstr_wn(str,count), - max_ext, (int)size->cx, (int)size->cy); - return ret; -} - extern const unsigned short bidi_direction_table[] DECLSPEC_HIDDEN; /*------------------------------------------------------------------------ @@ -1938,7 +1815,7 @@ static BOOL ext_text_out(struct pp_data *data, HANDLETABLE *htable, y = pt.y; } - PSDRV_GetTextMetrics(&data->pdev->dev, &tm); + GetTextMetricsW(hdc, &tm); GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf); if(!(tm.tmPitchAndFamily & TMPF_VECTOR)) /* Non-scalable fonts shouldn't be rotated */ @@ -2017,7 +1894,7 @@ static BOOL ext_text_out(struct pp_data *data, HANDLETABLE *htable, { INT *dx = malloc(count * sizeof(*dx)); - get_text_extent(data, str, count, -1, NULL, dx, &sz, !!(flags & ETO_GLYPH_INDEX)); + NtGdiGetTextExtentExW(hdc, str, count, -1, NULL, dx, &sz, !!(flags & ETO_GLYPH_INDEX)); deltas[0].x = dx[0]; deltas[0].y = 0; @@ -2062,7 +1939,7 @@ static BOOL ext_text_out(struct pp_data *data, HANDLETABLE *htable, { POINT desired[2]; - get_text_extent(data, str, count, 0, NULL, NULL, &sz, !!(flags & ETO_GLYPH_INDEX)); + NtGdiGetTextExtentExW(hdc, str, count, 0, NULL, NULL, &sz, !!(flags & ETO_GLYPH_INDEX)); desired[0].x = desired[0].y = 0; desired[1].x = sz.cx; desired[1].y = 0; @@ -3122,7 +2999,7 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) data->doc_name = wcsdup(open_data->pDocumentName); data->out_file = wcsdup(open_data->pOutputFile); - hdc = CreateCompatibleDC(NULL); + hdc = CreateDCW(L"winspool", open_data->pPrinterName, NULL, open_data->pDevMode); if (!hdc) { LocalFree(data); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index a1eb444ad14..40f590d0afd 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -434,8 +434,6 @@ extern INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID extern BOOL CDECL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT alpDx) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_PatBlt(PHYSDEV dev, struct bitblt_coords *dst, DWORD dwRop) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : imm32/tests: Mark some tests as broken by prior SetForegroundWindow call.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: c11ed566cb762850f2fe84e68025c8f9071b2244 URL: https://gitlab.winehq.org/wine/wine/-/commit/c11ed566cb762850f2fe84e68025c8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 9 17:15:39 2023 +0200 imm32/tests: Mark some tests as broken by prior SetForegroundWindow call. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54760 --- dlls/imm32/tests/imm32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 456c5d88b7e..4bdb6be4a31 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -5012,7 +5012,7 @@ static void test_ImmActivateLayout(void) { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_OPENSTATUSWINDOW}, - .todo = TRUE, + .todo = TRUE, .broken = TRUE, /* broken after SetForegroundWindow(GetDesktopWindow()) as in d3d8:device */ }, { .hkl = expect_ime, .himc = default_himc, @@ -5046,7 +5046,7 @@ static void test_ImmActivateLayout(void) { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_CLOSESTATUSWINDOW}, - .todo = TRUE, + .todo = TRUE, .broken = TRUE, /* broken after SetForegroundWindow(GetDesktopWindow()) as in d3d8:device */ }, { .hkl = expect_ime, .himc = default_himc, @@ -5203,7 +5203,7 @@ static void test_ImmCreateInputContext(void) { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_OPENSTATUSWINDOW}, - .todo = TRUE, + .todo = TRUE, .broken = TRUE, /* broken after SetForegroundWindow(GetDesktopWindow()) as in d3d8:device */ }, {0}, }; @@ -5258,7 +5258,7 @@ static void test_ImmCreateInputContext(void) { .hkl = expect_ime, .himc = default_himc, .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_CLOSESTATUSWINDOW}, - .todo = TRUE, + .todo = TRUE, .broken = TRUE, /* broken after SetForegroundWindow(GetDesktopWindow()) as in d3d8:device */ }, { .hkl = expect_ime, .himc = default_himc,

1 0

Michael Stefaniuc : dxdiagn: Avoid assigning COM objects to interface variables.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: e4b30b46c348b63eb07d5721338bfaad3353f8d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4b30b46c348b63eb07d5721338bfa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 9 18:27:29 2023 +0200 dxdiagn: Avoid assigning COM objects to interface variables. --- dlls/dxdiagn/container.c | 2 +- dlls/dxdiagn/provider.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index efc8cba448e..2627c321fa1 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -42,7 +42,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(IDxDiagContainer *ifac if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDxDiagContainer)) { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = &This->IDxDiagContainer_iface; return S_OK; } diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index d4a58dc45bc..0df10ea56ef 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -70,7 +70,7 @@ static HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(IDxDiagProvider *iface, if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDxDiagProvider)) { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = &This->IDxDiagProvider_iface; return S_OK; }

1 0

Michael Stefaniuc : dbgeng: Avoid casts to IUnknown* in IUnknown method calls.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: d0e5f14a6eb82e9fe1135bc59e847b9aa202279a URL: https://gitlab.winehq.org/wine/wine/-/commit/d0e5f14a6eb82e9fe1135bc59e847b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 9 21:36:42 2023 +0200 dbgeng: Avoid casts to IUnknown* in IUnknown method calls. --- dlls/dbgeng/dbgeng.c | 49 +++++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 6d4710163c9..cc29ffc69ed 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -1162,22 +1162,19 @@ static const IDebugClient7Vtbl debugclientvtbl = static HRESULT STDMETHODCALLTYPE debugdataspaces_QueryInterface(IDebugDataSpaces *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugDataSpaces(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_QueryInterface(unk, riid, obj); + return IUnknown_QueryInterface(&debug_client->IDebugClient_iface, riid, obj); } static ULONG STDMETHODCALLTYPE debugdataspaces_AddRef(IDebugDataSpaces *iface) { struct debug_client *debug_client = impl_from_IDebugDataSpaces(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_AddRef(unk); + return IUnknown_AddRef(&debug_client->IDebugClient_iface); } static ULONG STDMETHODCALLTYPE debugdataspaces_Release(IDebugDataSpaces *iface) { struct debug_client *debug_client = impl_from_IDebugDataSpaces(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_Release(unk); + return IUnknown_Release(&debug_client->IDebugClient_iface); } static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtual(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, @@ -1391,22 +1388,19 @@ static const IDebugDataSpacesVtbl debugdataspacesvtbl = static HRESULT STDMETHODCALLTYPE debugsymbols_QueryInterface(IDebugSymbols3 *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_QueryInterface(unk, riid, obj); + return IUnknown_QueryInterface(&debug_client->IDebugClient_iface, riid, obj); } static ULONG STDMETHODCALLTYPE debugsymbols_AddRef(IDebugSymbols3 *iface) { struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_AddRef(unk); + return IUnknown_AddRef(&debug_client->IDebugClient_iface); } static ULONG STDMETHODCALLTYPE debugsymbols_Release(IDebugSymbols3 *iface) { struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_Release(unk); + return IUnknown_Release(&debug_client->IDebugClient_iface); } static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolOptions(IDebugSymbols3 *iface, ULONG *options) @@ -2690,22 +2684,19 @@ static const IDebugSymbols3Vtbl debugsymbolsvtbl = static HRESULT STDMETHODCALLTYPE debugcontrol_QueryInterface(IDebugControl4 *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugControl4(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_QueryInterface(unk, riid, obj); + return IUnknown_QueryInterface(&debug_client->IDebugClient_iface, riid, obj); } static ULONG STDMETHODCALLTYPE debugcontrol_AddRef(IDebugControl4 *iface) { struct debug_client *debug_client = impl_from_IDebugControl4(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_AddRef(unk); + return IUnknown_AddRef(&debug_client->IDebugClient_iface); } static ULONG STDMETHODCALLTYPE debugcontrol_Release(IDebugControl4 *iface) { struct debug_client *debug_client = impl_from_IDebugControl4(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_Release(unk); + return IUnknown_Release(&debug_client->IDebugClient_iface); } static HRESULT STDMETHODCALLTYPE debugcontrol_GetInterrupt(IDebugControl4 *iface) @@ -4278,19 +4269,19 @@ static const IDebugControl4Vtbl debugcontrolvtbl = static HRESULT STDMETHODCALLTYPE debugadvanced_QueryInterface(IDebugAdvanced3 *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugAdvanced3(iface); - return IUnknown_QueryInterface((IUnknown *)&debug_client->IDebugClient_iface, riid, obj); + return IUnknown_QueryInterface(&debug_client->IDebugClient_iface, riid, obj); } static ULONG STDMETHODCALLTYPE debugadvanced_AddRef(IDebugAdvanced3 *iface) { struct debug_client *debug_client = impl_from_IDebugAdvanced3(iface); - return IUnknown_AddRef((IUnknown *)&debug_client->IDebugClient_iface); + return IUnknown_AddRef(&debug_client->IDebugClient_iface); } static ULONG STDMETHODCALLTYPE debugadvanced_Release(IDebugAdvanced3 *iface) { struct debug_client *debug_client = impl_from_IDebugAdvanced3(iface); - return IUnknown_Release((IUnknown *)&debug_client->IDebugClient_iface); + return IUnknown_Release(&debug_client->IDebugClient_iface); } static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced3 *iface, void *context, @@ -4404,22 +4395,19 @@ static const IDebugAdvanced3Vtbl debugadvancedvtbl = static HRESULT STDMETHODCALLTYPE debugsystemobjects_QueryInterface(IDebugSystemObjects *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugSystemObjects(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_QueryInterface(unk, riid, obj); + return IUnknown_QueryInterface(&debug_client->IDebugClient_iface, riid, obj); } static ULONG STDMETHODCALLTYPE debugsystemobjects_AddRef(IDebugSystemObjects *iface) { struct debug_client *debug_client = impl_from_IDebugSystemObjects(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_AddRef(unk); + return IUnknown_AddRef(&debug_client->IDebugClient_iface); } static ULONG STDMETHODCALLTYPE debugsystemobjects_Release(IDebugSystemObjects *iface) { struct debug_client *debug_client = impl_from_IDebugSystemObjects(iface); - IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; - return IUnknown_Release(unk); + return IUnknown_Release(&debug_client->IDebugClient_iface); } static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetEventThread(IDebugSystemObjects *iface, ULONG *id) @@ -4700,7 +4688,6 @@ HRESULT WINAPI DebugExtensionInitialize(ULONG * pVersion, ULONG * pFlags) HRESULT WINAPI DebugCreate(REFIID riid, void **obj) { struct debug_client *debug_client; - IUnknown *unk; HRESULT hr; TRACE("%s, %p.\n", debugstr_guid(riid), obj); @@ -4717,10 +4704,8 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) debug_client->refcount = 1; list_init(&debug_client->targets); - unk = (IUnknown *)&debug_client->IDebugClient_iface; - - hr = IUnknown_QueryInterface(unk, riid, obj); - IUnknown_Release(unk); + hr = IUnknown_QueryInterface(&debug_client->IDebugClient_iface, riid, obj); + IUnknown_Release(&debug_client->IDebugClient_iface); return hr; }

1 0

Brendan Shanks : include: Implement C_ASSERT() using the C11 _Static_assert() if available.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 820a9d0d6ca3e406c7adb522773feb50d374ae1a URL: https://gitlab.winehq.org/wine/wine/-/commit/820a9d0d6ca3e406c7adb522773feb… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 8 12:58:07 2023 -0700 include: Implement C_ASSERT() using the C11 _Static_assert() if available. --- include/winnt.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 01a14de972b..64408126cba 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -417,7 +417,11 @@ extern "C" { /* Compile time assertion */ +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) +#define C_ASSERT(e) _Static_assert(e, #e) +#else #define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1]) +#endif /* Eliminate Microsoft C/C++ compiler warning 4715 */ #if defined(_MSC_VER) && (_MSC_VER > 1200)

1 0

Alistair Leslie-Hughes : activeds: Free memory on error paths (coverity).
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 992ec949ba3a51758033386567a1deda80fa4a6e URL: https://gitlab.winehq.org/wine/wine/-/commit/992ec949ba3a51758033386567a1de… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 8 09:05:42 2023 +1000 activeds: Free memory on error paths (coverity). --- dlls/activeds/pathname.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index 943afd5603d..05db9bc8071 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -136,7 +136,10 @@ static HRESULT parse_path(BSTR path, BSTR *provider, BSTR *server, BSTR *dn) if (!*p) return S_OK; if (*p++ != '/' || *p++ != '/' || !*p) + { + SysFreeString(*provider); return E_ADS_BAD_PATHNAME; + } p_server = p; server_len = 0; @@ -145,7 +148,11 @@ static HRESULT parse_path(BSTR path, BSTR *provider, BSTR *server, BSTR *dn) p++; server_len++; } - if (server_len == 0) return E_ADS_BAD_PATHNAME; + if (server_len == 0) + { + SysFreeString(*provider); + return E_ADS_BAD_PATHNAME; + } *server = SysAllocStringLen(p_server, server_len); if (!*server)

1 0

Piotr Caban : wineps: Copy GetDeviceCaps implementation to unixlib.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 75e0072cc2088d2e07717eec0a22315d31603825 URL: https://gitlab.winehq.org/wine/wine/-/commit/75e0072cc2088d2e07717eec0a2231… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 3 18:02:54 2023 +0200 wineps: Copy GetDeviceCaps implementation to unixlib. --- dlls/wineps.drv/Makefile.in | 2 + dlls/wineps.drv/init.c | 98 ++++----------------------- dlls/wineps.drv/psdrv.h | 2 + dlls/wineps.drv/unixlib.c | 157 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wineps.drv/unixlib.h | 31 +++++++++ 5 files changed, 205 insertions(+), 85 deletions(-)

1 0

Piotr Caban : wineps: Copy ResetDC implementation to unixlib.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: ab38530e816eb10a251c0e20fbf79f166941760b URL: https://gitlab.winehq.org/wine/wine/-/commit/ab38530e816eb10a251c0e20fbf79f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 3 19:40:47 2023 +0200 wineps: Copy ResetDC implementation to unixlib. --- dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/unixlib.c | 364 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 364 insertions(+), 1 deletion(-)

1 0

Piotr Caban : wineps: Move ExtEscape implementation to unixlib.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 8cfa8c15ee619b1b2549e931ffcfdd7f8fc94661 URL: https://gitlab.winehq.org/wine/wine/-/commit/8cfa8c15ee619b1b2549e931ffcfdd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 4 19:56:34 2023 +0200 wineps: Move ExtEscape implementation to unixlib. --- dlls/wineps.drv/escape.c | 358 +++++++++------------------------------------- dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/unixlib.c | 260 +++++++++++++++++++++++++++++++++ 3 files changed, 329 insertions(+), 290 deletions(-)

1 0

Piotr Caban : wineps: Store font related strings in unicode.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 11ab927ae20bb0b29a105562845ed7821d993d02 URL: https://gitlab.winehq.org/wine/wine/-/commit/11ab927ae20bb0b29a105562845ed7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 5 15:20:42 2023 +0200 wineps: Store font related strings in unicode. --- dlls/wineps.drv/afm.c | 14 ++++---- dlls/wineps.drv/afm2c.c | 8 ++--- dlls/wineps.drv/builtin.c | 38 ++++++++++----------- dlls/wineps.drv/data/AvantGarde_Book.c | 6 ++-- dlls/wineps.drv/data/AvantGarde_BookOblique.c | 6 ++-- dlls/wineps.drv/data/AvantGarde_Demi.c | 6 ++-- dlls/wineps.drv/data/AvantGarde_DemiOblique.c | 6 ++-- dlls/wineps.drv/data/Bookman_Demi.c | 6 ++-- dlls/wineps.drv/data/Bookman_DemiItalic.c | 6 ++-- dlls/wineps.drv/data/Bookman_Light.c | 6 ++-- dlls/wineps.drv/data/Bookman_LightItalic.c | 6 ++-- dlls/wineps.drv/data/Courier.c | 6 ++-- dlls/wineps.drv/data/Courier_Bold.c | 6 ++-- dlls/wineps.drv/data/Courier_BoldOblique.c | 6 ++-- dlls/wineps.drv/data/Courier_Oblique.c | 6 ++-- dlls/wineps.drv/data/Helvetica.c | 6 ++-- dlls/wineps.drv/data/Helvetica_Bold.c | 6 ++-- dlls/wineps.drv/data/Helvetica_BoldOblique.c | 6 ++-- dlls/wineps.drv/data/Helvetica_Narrow.c | 6 ++-- dlls/wineps.drv/data/Helvetica_Narrow_Bold.c | 6 ++-- .../wineps.drv/data/Helvetica_Narrow_BoldOblique.c | 6 ++-- dlls/wineps.drv/data/Helvetica_Narrow_Oblique.c | 6 ++-- dlls/wineps.drv/data/Helvetica_Oblique.c | 6 ++-- dlls/wineps.drv/data/NewCenturySchlbk_Bold.c | 6 ++-- dlls/wineps.drv/data/NewCenturySchlbk_BoldItalic.c | 6 ++-- dlls/wineps.drv/data/NewCenturySchlbk_Italic.c | 6 ++-- dlls/wineps.drv/data/NewCenturySchlbk_Roman.c | 6 ++-- dlls/wineps.drv/data/Palatino_Bold.c | 6 ++-- dlls/wineps.drv/data/Palatino_BoldItalic.c | 6 ++-- dlls/wineps.drv/data/Palatino_Italic.c | 6 ++-- dlls/wineps.drv/data/Palatino_Roman.c | 6 ++-- dlls/wineps.drv/data/Symbol.c | 6 ++-- dlls/wineps.drv/data/Times_Bold.c | 6 ++-- dlls/wineps.drv/data/Times_BoldItalic.c | 6 ++-- dlls/wineps.drv/data/Times_Italic.c | 6 ++-- dlls/wineps.drv/data/Times_Roman.c | 6 ++-- dlls/wineps.drv/data/ZapfChancery_MediumItalic.c | 6 ++-- dlls/wineps.drv/data/ZapfDingbats.c | 6 ++-- dlls/wineps.drv/font.c | 38 +++++++++------------ dlls/wineps.drv/init.c | 14 ++++---- dlls/wineps.drv/ppd.c | 2 +- dlls/wineps.drv/psdrv.h | 14 ++++---- dlls/wineps.drv/type1afm.c | 39 ++++++++++++++++++---- 43 files changed, 197 insertions(+), 180 deletions(-)

1 0