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

Francois Gouget : windowscodecs: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 7f1cd647f61fc0992ce9572784a7cf62a5705a2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f1cd647f61fc0992ce95727… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:22:44 2021 +0200 windowscodecs: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index 89e352b8946..2c72cdfc1b5 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -565,7 +565,7 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetContainerFormat(IWICMetadataBl return S_OK; } -static HRESULT WINAPI CommonDecoderFrame_InitializeMetadata(CommonDecoderFrame *This) +static HRESULT CommonDecoderFrame_InitializeMetadata(CommonDecoderFrame *This) { HRESULT hr=S_OK;

1 0

Jacek Caban : gdi32: Move EnumFontFamiliesEx wrappers to text.c.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: fab977f7b27793dd52d3cbce02b0a1e89d61d93a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fab977f7b27793dd52d3cbce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:55:28 2021 +0200 gdi32: Move EnumFontFamiliesEx wrappers to text.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 60 ------------------------------------------------------- dlls/gdi32/text.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 60 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7ba6b3466c4..b3321d5fbf7 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4490,66 +4490,6 @@ INT WINAPI EnumFontFamiliesExA( HDC hDC, LPLOGFONTA plf, return FONT_EnumFontFamiliesEx( hDC, plfW, (FONTENUMPROCW)efproc, lParam, FALSE ); } -/*********************************************************************** - * EnumFontFamiliesA (GDI32.@) - */ -INT WINAPI EnumFontFamiliesA( HDC hDC, LPCSTR lpFamily, - FONTENUMPROCA efproc, LPARAM lpData ) -{ - LOGFONTA lf, *plf; - - if (lpFamily) - { - if (!*lpFamily) return 1; - lstrcpynA( lf.lfFaceName, lpFamily, LF_FACESIZE ); - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfPitchAndFamily = 0; - plf = &lf; - } - else plf = NULL; - - return EnumFontFamiliesExA( hDC, plf, efproc, lpData, 0 ); -} - -/*********************************************************************** - * EnumFontFamiliesW (GDI32.@) - */ -INT WINAPI EnumFontFamiliesW( HDC hDC, LPCWSTR lpFamily, - FONTENUMPROCW efproc, LPARAM lpData ) -{ - LOGFONTW lf, *plf; - - if (lpFamily) - { - if (!*lpFamily) return 1; - lstrcpynW( lf.lfFaceName, lpFamily, LF_FACESIZE ); - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfPitchAndFamily = 0; - plf = &lf; - } - else plf = NULL; - - return EnumFontFamiliesExW( hDC, plf, efproc, lpData, 0 ); -} - -/*********************************************************************** - * EnumFontsA (GDI32.@) - */ -INT WINAPI EnumFontsA( HDC hDC, LPCSTR lpName, FONTENUMPROCA efproc, - LPARAM lpData ) -{ - return EnumFontFamiliesA( hDC, lpName, efproc, lpData ); -} - -/*********************************************************************** - * EnumFontsW (GDI32.@) - */ -INT WINAPI EnumFontsW( HDC hDC, LPCWSTR lpName, FONTENUMPROCW efproc, - LPARAM lpData ) -{ - return EnumFontFamiliesW( hDC, lpName, efproc, lpData ); -} - /*********************************************************************** * NtGdiSetTextJustification (win32u.@) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 117f5921c9d..f41cf67a5db 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -2002,3 +2002,55 @@ BOOL WINAPI GdiRealizationInfo( HDC hdc, struct realization_info *info ) info->instance_id = ri.instance_id; return TRUE; } + +/*********************************************************************** + * EnumFontFamiliesA (GDI32.@) + */ +INT WINAPI EnumFontFamiliesA( HDC hdc, const char *family, FONTENUMPROCA efproc, LPARAM data ) +{ + LOGFONTA lf; + + if (family) + { + if (!*family) return 1; + lstrcpynA( lf.lfFaceName, family, LF_FACESIZE ); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = 0; + } + + return EnumFontFamiliesExA( hdc, family ? &lf : NULL, efproc, data, 0 ); +} + +/*********************************************************************** + * EnumFontFamiliesW (GDI32.@) + */ +INT WINAPI EnumFontFamiliesW( HDC hdc, const WCHAR *family, FONTENUMPROCW efproc, LPARAM data ) +{ + LOGFONTW lf; + + if (family) + { + if (!*family) return 1; + lstrcpynW( lf.lfFaceName, family, LF_FACESIZE ); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = 0; + } + + return EnumFontFamiliesExW( hdc, family ? &lf : NULL, efproc, data, 0 ); +} + +/*********************************************************************** + * EnumFontsA (GDI32.@) + */ +INT WINAPI EnumFontsA( HDC hdc, const char *name, FONTENUMPROCA efproc, LPARAM data ) +{ + return EnumFontFamiliesA( hdc, name, efproc, data ); +} + +/*********************************************************************** + * EnumFontsW (GDI32.@) + */ +INT WINAPI EnumFontsW( HDC hdc, const WCHAR *name, FONTENUMPROCW efproc, LPARAM data ) +{ + return EnumFontFamiliesW( hdc, name, efproc, data ); +}

1 0

Michael Stefaniuc : quartz: Forward dsound_render_qc_Release() to a release method.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 21c4a25437969696cbf5ffecee191ba8302bb2dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c4a25437969696cbf5ffec… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Aug 29 14:00:17 2021 +0200 quartz: Forward dsound_render_qc_Release() to a release method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 3a6b7764634..51a66ac5d30 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -955,7 +955,7 @@ static ULONG WINAPI dsound_render_qc_AddRef(IQualityControl *iface) static ULONG WINAPI dsound_render_qc_Release(IQualityControl *iface) { struct dsound_render *filter = impl_from_IQualityControl(iface); - return IUnknown_AddRef(filter->filter.outer_unk); + return IUnknown_Release(filter->filter.outer_unk); } static HRESULT WINAPI dsound_render_qc_Notify(IQualityControl *iface,

1 0

Francois Gouget : winex11.drv: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: e201c4f36e03b63e192af399c06e904f5a170e9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e201c4f36e03b63e192af399… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:19:06 2021 +0200 winex11.drv: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index fd39b58bb3b..791787cfd3a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1539,7 +1539,7 @@ void destroy_gl_drawable( HWND hwnd ) * * Get the pixel-format descriptor associated to the given id */ -static int WINAPI describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, BOOL allow_offscreen ) +static int describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, BOOL allow_offscreen ) { /*XVisualInfo *vis;*/ int value;

1 0

Jacek Caban : gdi32: Use ntgdi names for object functions.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 111b9def835190a1ea1f1552e59880ea99ba0599 URL: https://source.winehq.org/git/wine.git/?a=commit;h=111b9def835190a1ea1f1552… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:57:05 2021 +0200 gdi32: Use ntgdi names for object functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/gdi32.spec | 8 ++++---- dlls/gdi32/gdiobj.c | 26 +++++++++++--------------- dlls/gdi32/palette.c | 2 +- include/ntgdi.h | 3 +++ 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 878c0de4006..a3147c9b0c4 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1439,7 +1439,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( { const EMRSETCOLORADJUSTMENT *lpSetColorAdjust = (const EMRSETCOLORADJUSTMENT *)mr; - SetColorAdjustment( hdc, &lpSetColorAdjust->ColorAdjustment ); + NtGdiSetColorAdjustment( hdc, &lpSetColorAdjust->ColorAdjustment ); break; } diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 4e0f0bf37a3..0e5c83926f8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -189,7 +189,7 @@ # @ stub GdiEndPageEMF @ stdcall GdiEntry13() # @ stub GdiFixUpHandle -@ stdcall GdiFlush() +@ stdcall GdiFlush() NtGdiFlush # @ stub GdiFullscreenControl @ stdcall GdiGetBatchLimit() @ stdcall GdiGetCharDimensions(long ptr ptr) @@ -266,7 +266,7 @@ @ stdcall GetCharacterPlacementW(long wstr long long ptr long) @ stdcall GetClipBox(long ptr) NtGdiGetAppClipBox @ stdcall GetClipRgn(long long) -@ stdcall GetColorAdjustment(long ptr) +@ stdcall GetColorAdjustment(long ptr) NtGdiGetColorAdjustment @ stdcall GetColorSpace(long) @ stdcall GetCurrentObject(long long) @ stdcall GetCurrentPositionEx(long ptr) @@ -482,7 +482,7 @@ @ stdcall SetBoundsRect(long ptr long) NtGdiSetBoundsRect # @ stub SetBrushAttributes @ stdcall SetBrushOrgEx(long long long ptr) -@ stdcall SetColorAdjustment(long ptr) +@ stdcall SetColorAdjustment(long ptr) NtGdiSetColorAdjustment @ stdcall SetColorSpace(long long) @ stdcall SetDCBrushColor(long long) @ stdcall SetDCPenColor(long long) @@ -539,7 +539,7 @@ @ stdcall TextOutW(long long long wstr long) @ stdcall TranslateCharsetInfo(ptr ptr long) @ stub UnloadNetworkFonts -@ stdcall UnrealizeObject(long) +@ stdcall UnrealizeObject(long) NtGdiUnrealizeObject @ stdcall UpdateColors(long) NtGdiUpdateColors @ stdcall UpdateICMRegKey(long str str long) UpdateICMRegKeyA @ stdcall UpdateICMRegKeyA(long str str long) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 07277a12e8c..2e99d6a830b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -407,7 +407,7 @@ static const struct DefaultFontInfo default_fonts[] = /************************************************************************* - * __wine_make_gdi_object_system (GDI32.@) + * __wine_make_gdi_object_system (win32u.@) * * USER has to tell GDI that its system brushes and pens are non-deletable. * For a description of the GDI object magics and their flags, @@ -1065,9 +1065,9 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) /*********************************************************************** - * UnrealizeObject (GDI32.@) + * NtGdiUnrealizeObject (win32u.@) */ -BOOL WINAPI UnrealizeObject( HGDIOBJ obj ) +BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ) { const struct gdi_obj_funcs *funcs = NULL; GDI_HANDLE_ENTRY *entry; @@ -1180,9 +1180,9 @@ DWORD WINAPI GdiInitializeLanguagePack( DWORD arg ) } /*********************************************************************** - * GdiFlush (GDI32.@) + * NtGdiFlush (win32u.@) */ -BOOL WINAPI GdiFlush(void) +BOOL WINAPI NtGdiFlush(void) { return TRUE; /* FIXME */ } @@ -1207,23 +1207,19 @@ DWORD WINAPI GdiSetBatchLimit( DWORD limit ) /******************************************************************* - * GetColorAdjustment [GDI32.@] - * - * + * NtGdiGetColorAdjustment (win32u.@) */ -BOOL WINAPI GetColorAdjustment(HDC hdc, LPCOLORADJUSTMENT lpca) +BOOL WINAPI NtGdiGetColorAdjustment( HDC hdc, COLORADJUSTMENT *ca ) { - FIXME("stub\n"); + FIXME( "stub\n" ); return FALSE; } /******************************************************************* - * SetColorAdjustment [GDI32.@] - * - * + * NtGdiSetColorAdjustment (win32u.@) */ -BOOL WINAPI SetColorAdjustment(HDC hdc, const COLORADJUSTMENT* lpca) +BOOL WINAPI NtGdiSetColorAdjustment( HDC hdc, const COLORADJUSTMENT *ca ) { - FIXME("stub\n"); + FIXME( "stub\n" ); return FALSE; } diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 3d2e27c1fc6..aa7745dc65f 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -215,7 +215,7 @@ static UINT set_palette_entries( HPALETTE hpalette, UINT start, UINT count, if (start+count > numEntries) count = numEntries - start; memcpy( &palPtr->entries[start], entries, count * sizeof(PALETTEENTRY) ); GDI_ReleaseObj( hpalette ); - UnrealizeObject( hpalette ); + NtGdiUnrealizeObject( hpalette ); return count; } diff --git a/include/ntgdi.h b/include/ntgdi.h index 81f5a49f665..7fa2b09b2e0 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -253,6 +253,7 @@ INT WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, INT driver_id, INT escap BOOL WINAPI NtGdiExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT type ); BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, const WCHAR *str, UINT count, const INT *dx, DWORD cp ); +BOOL WINAPI NtGdiFlush(void); BOOL WINAPI NtGdiFrameRgn( HDC hdc, HRGN hrgn, HBRUSH brush, INT width, INT height ); BOOL WINAPI NtGdiFillPath( HDC hdc ); @@ -265,6 +266,7 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *c BOOL WINAPI NtGdiGetCharWidthInfo( HDC hdc, struct char_width_info *info ); BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, WCHAR *chars, ULONG flags, void *buffer ); +BOOL WINAPI NtGdiGetColorAdjustment( HDC hdc, COLORADJUSTMENT *ca ); BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ); BOOL WINAPI NtGdiGetDCPoint( HDC hdc, UINT method, POINT *result ); INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ); @@ -343,6 +345,7 @@ LONG WINAPI NtGdiSetBitmapBits( HBITMAP hbitmap, LONG count, const void *bit BOOL WINAPI NtGdiSetBitmapDimension( HBITMAP hbitmap, INT x, INT y, SIZE *prev_size ); BOOL WINAPI NtGdiSetBrushOrg( HDC hdc, INT x, INT y, POINT *prev_org ); UINT WINAPI NtGdiSetBoundsRect( HDC hdc, const RECT *rect, UINT flags ); +BOOL WINAPI NtGdiSetColorAdjustment( HDC hdc, const COLORADJUSTMENT *ca ); INT WINAPI NtGdiSetDIBitsToDeviceInternal( HDC hdc, INT x_dst, INT y_dst, DWORD cx, DWORD cy, INT x_src, INT y_src, UINT startscan, UINT lines, const void *bits, const BITMAPINFO *bmi,

1 0

Jacek Caban : gdi32: Move more DC stubs to gdidc.c.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 0e257cb1fbcd54c86840bc5d2f7a873266495c11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e257cb1fbcd54c86840bc5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:56:46 2021 +0200 gdi32: Move more DC stubs to gdidc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 37 ------------------------------------- dlls/gdi32/gdidc.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a5ba3ad4ea7..340476bca10 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -29,7 +29,6 @@ #include "winbase.h" #include "wingdi.h" #include "winreg.h" -#include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" @@ -1147,42 +1146,6 @@ INT WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, int driver_id, INT escape, IN } -/******************************************************************* - * DrawEscape [GDI32.@] - * - * - */ -INT WINAPI DrawEscape(HDC hdc, INT nEscape, INT cbInput, LPCSTR lpszInData) -{ - FIXME("DrawEscape, stub\n"); - return 0; -} - -/******************************************************************* - * NamedEscape [GDI32.@] - */ -INT WINAPI NamedEscape( HDC hdc, LPCWSTR pDriver, INT nEscape, INT cbInput, LPCSTR lpszInData, - INT cbOutput, LPSTR lpszOutData ) -{ - FIXME("(%p, %s, %d, %d, %p, %d, %p)\n", - hdc, wine_dbgstr_w(pDriver), nEscape, cbInput, lpszInData, cbOutput, - lpszOutData); - return 0; -} - -/******************************************************************* - * DdQueryDisplaySettingsUniqueness [GDI32.@] - * GdiEntry13 [GDI32.@] - */ -ULONG WINAPI DdQueryDisplaySettingsUniqueness(VOID) -{ - static int warn_once; - - if (!warn_once++) - FIXME("stub\n"); - return 0; -} - /****************************************************************************** * NtGdiDdDDIOpenAdapterFromHdc (win32u.@) */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index e12dbfeff03..c3c7ad710f2 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -22,6 +22,7 @@ #include "gdi_private.h" #include "winternl.h" +#include "ddrawgdi.h" #include "wine/debug.h" @@ -1843,3 +1844,34 @@ BOOL WINAPI GdiIsPlayMetafileDC( HDC hdc ) FIXME( "%p\n", hdc ); return FALSE; } + +/******************************************************************* + * DrawEscape (GDI32.@) + */ +INT WINAPI DrawEscape( HDC hdc, INT escape, INT input_size, const char *input ) +{ + FIXME( "stub\n" ); + return 0; +} + +/******************************************************************* + * NamedEscape (GDI32.@) + */ +INT WINAPI NamedEscape( HDC hdc, const WCHAR *driver, INT escape, INT input_size, + const char *input, INT output_size, char *output ) +{ + FIXME( "(%p %s %d, %d %p %d %p)\n", hdc, wine_dbgstr_w(driver), escape, input_size, + input, output_size, output ); + return 0; +} + +/******************************************************************* + * DdQueryDisplaySettingsUniqueness (GDI32.@) + * GdiEntry13 + */ +ULONG WINAPI DdQueryDisplaySettingsUniqueness(void) +{ + static int warn_once; + if (!warn_once++) FIXME( "stub\n" ); + return 0; +}

1 0

Jacek Caban : gdi32: Move resource functions wrappers to text.c.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 34449789d312e8c4dd9401d4ee096ee1ea3c78bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=34449789d312e8c4dd9401d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:55:52 2021 +0200 gdi32: Move resource functions wrappers to text.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 117 ------------------------------------------------------ dlls/gdi32/text.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 117 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b3321d5fbf7..f661dbd5da3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5570,51 +5570,6 @@ DWORD WINAPI NtGdiGetGlyphOutlineW( HDC hdc, UINT ch, UINT format, GLYPHMETRICS } -/*********************************************************************** - * CreateScalableFontResourceA (GDI32.@) - */ -BOOL WINAPI CreateScalableFontResourceA( DWORD fHidden, - LPCSTR lpszResourceFile, - LPCSTR lpszFontFile, - LPCSTR lpszCurrentPath ) -{ - LPWSTR lpszResourceFileW = NULL; - LPWSTR lpszFontFileW = NULL; - LPWSTR lpszCurrentPathW = NULL; - int len; - BOOL ret; - - if (lpszResourceFile) - { - len = MultiByteToWideChar(CP_ACP, 0, lpszResourceFile, -1, NULL, 0); - lpszResourceFileW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpszResourceFile, -1, lpszResourceFileW, len); - } - - if (lpszFontFile) - { - len = MultiByteToWideChar(CP_ACP, 0, lpszFontFile, -1, NULL, 0); - lpszFontFileW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpszFontFile, -1, lpszFontFileW, len); - } - - if (lpszCurrentPath) - { - len = MultiByteToWideChar(CP_ACP, 0, lpszCurrentPath, -1, NULL, 0); - lpszCurrentPathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpszCurrentPath, -1, lpszCurrentPathW, len); - } - - ret = CreateScalableFontResourceW(fHidden, lpszResourceFileW, - lpszFontFileW, lpszCurrentPathW); - - HeapFree(GetProcessHeap(), 0, lpszResourceFileW); - HeapFree(GetProcessHeap(), 0, lpszFontFileW); - HeapFree(GetProcessHeap(), 0, lpszCurrentPathW); - - return ret; -} - #define NE_FFLAGS_LIBMODULE 0x8000 #define NE_OSFLAGS_WINDOWS 0x02 @@ -5999,38 +5954,6 @@ DWORD WINAPI NtGdiGetGlyphIndicesW( HDC hdc, const WCHAR *str, INT count, * * ***********************************************************************/ -/*********************************************************************** - * AddFontResourceA (GDI32.@) - */ -INT WINAPI AddFontResourceA( LPCSTR str ) -{ - return AddFontResourceExA( str, 0, NULL); -} - -/*********************************************************************** - * AddFontResourceW (GDI32.@) - */ -INT WINAPI AddFontResourceW( LPCWSTR str ) -{ - return AddFontResourceExW(str, 0, NULL); -} - - -/*********************************************************************** - * AddFontResourceExA (GDI32.@) - */ -INT WINAPI AddFontResourceExA( LPCSTR str, DWORD fl, PVOID pdv ) -{ - DWORD len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - LPWSTR strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - INT ret; - - MultiByteToWideChar(CP_ACP, 0, str, -1, strW, len); - ret = AddFontResourceExW(strW, fl, pdv); - HeapFree(GetProcessHeap(), 0, strW); - return ret; -} - static BOOL CALLBACK load_enumed_resource(HMODULE hModule, LPCWSTR type, LPWSTR name, LONG_PTR lParam) { HRSRC rsrc = FindResourceW(hModule, name, type); @@ -6485,22 +6408,6 @@ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD flags, PVOID pdv ) return ret; } -/*********************************************************************** - * RemoveFontResourceA (GDI32.@) - */ -BOOL WINAPI RemoveFontResourceA( LPCSTR str ) -{ - return RemoveFontResourceExA(str, 0, 0); -} - -/*********************************************************************** - * RemoveFontResourceW (GDI32.@) - */ -BOOL WINAPI RemoveFontResourceW( LPCWSTR str ) -{ - return RemoveFontResourceExW(str, 0, 0); -} - /*********************************************************************** * AddFontMemResourceEx (GDI32.@) */ @@ -6558,21 +6465,6 @@ BOOL WINAPI RemoveFontMemResourceEx( HANDLE fh ) return TRUE; } -/*********************************************************************** - * RemoveFontResourceExA (GDI32.@) - */ -BOOL WINAPI RemoveFontResourceExA( LPCSTR str, DWORD fl, PVOID pdv ) -{ - DWORD len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - LPWSTR strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - INT ret; - - MultiByteToWideChar(CP_ACP, 0, str, -1, strW, len); - ret = RemoveFontResourceExW(strW, fl, pdv); - HeapFree(GetProcessHeap(), 0, strW); - return ret; -} - /*********************************************************************** * RemoveFontResourceExW (GDI32.@) */ @@ -6603,15 +6495,6 @@ BOOL WINAPI RemoveFontResourceExW( LPCWSTR str, DWORD flags, PVOID pdv ) return ret; } -/*********************************************************************** - * GetFontResourceInfoW (GDI32.@) - */ -BOOL WINAPI GetFontResourceInfoW( LPCWSTR str, LPDWORD size, PVOID buffer, DWORD type ) -{ - FIXME("%s %p(%d) %p %d\n", debugstr_w(str), size, size ? *size : 0, buffer, type); - return FALSE; -} - /*********************************************************************** * NtGdiGetFontUnicodeRanges (win32u.@) * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index f41cf67a5db..093699acbed 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -2054,3 +2054,116 @@ INT WINAPI EnumFontsW( HDC hdc, const WCHAR *name, FONTENUMPROCW efproc, LPARAM { return EnumFontFamiliesW( hdc, name, efproc, data ); } + +/*********************************************************************** + * CreateScalableFontResourceA (GDI32.@) + */ +BOOL WINAPI CreateScalableFontResourceA( DWORD hidden, const char *resource_file, + const char *font_file, const char *current_path ) +{ + WCHAR *resource_fileW = NULL; + WCHAR *current_pathW = NULL; + WCHAR *font_fileW = NULL; + int len; + BOOL ret; + + if (resource_file) + { + len = MultiByteToWideChar( CP_ACP, 0, resource_file, -1, NULL, 0 ); + resource_fileW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, resource_file, -1, resource_fileW, len ); + } + + if (font_file) + { + len = MultiByteToWideChar( CP_ACP, 0, font_file, -1, NULL, 0 ); + font_fileW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, font_file, -1, font_fileW, len ); + } + + if (current_path) + { + len = MultiByteToWideChar( CP_ACP, 0, current_path, -1, NULL, 0 ); + current_pathW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, current_path, -1, current_pathW, len ); + } + + ret = CreateScalableFontResourceW( hidden, resource_fileW, + font_fileW, current_pathW ); + + HeapFree(GetProcessHeap(), 0, resource_fileW); + HeapFree(GetProcessHeap(), 0, font_fileW); + HeapFree(GetProcessHeap(), 0, current_pathW); + return ret; +} + +/*********************************************************************** + * AddFontResourceA (GDI32.@) + */ +INT WINAPI AddFontResourceA( const char *str ) +{ + return AddFontResourceExA( str, 0, NULL); +} + +/*********************************************************************** + * AddFontResourceW (GDI32.@) + */ +INT WINAPI AddFontResourceW( const WCHAR *str ) +{ + return AddFontResourceExW( str, 0, NULL ); +} + +/*********************************************************************** + * AddFontResourceExA (GDI32.@) + */ +INT WINAPI AddFontResourceExA( const char *str, DWORD fl, void *pdv ) +{ + DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + LPWSTR strW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + INT ret; + + MultiByteToWideChar( CP_ACP, 0, str, -1, strW, len ); + ret = AddFontResourceExW( strW, fl, pdv ); + HeapFree( GetProcessHeap(), 0, strW ); + return ret; +} + +/*********************************************************************** + * RemoveFontResourceA (GDI32.@) + */ +BOOL WINAPI RemoveFontResourceA( const char *str ) +{ + return RemoveFontResourceExA( str, 0, 0 ); +} + +/*********************************************************************** + * RemoveFontResourceW (GDI32.@) + */ +BOOL WINAPI RemoveFontResourceW( const WCHAR *str ) +{ + return RemoveFontResourceExW( str, 0, 0 ); +} + +/*********************************************************************** + * RemoveFontResourceExA (GDI32.@) + */ +BOOL WINAPI RemoveFontResourceExA( const char *str, DWORD fl, void *pdv ) +{ + DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + LPWSTR strW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + INT ret; + + MultiByteToWideChar( CP_ACP, 0, str, -1, strW, len ); + ret = RemoveFontResourceExW( strW, fl, pdv ); + HeapFree( GetProcessHeap(), 0, strW ); + return ret; +} + +/*********************************************************************** + * GetFontResourceInfoW (GDI32.@) + */ +BOOL WINAPI GetFontResourceInfoW( const WCHAR *str, DWORD *size, void *buffer, DWORD type ) +{ + FIXME( "%s %p(%d) %p %d\n", debugstr_w(str), size, size ? *size : 0, buffer, type ); + return FALSE; +}

1 0

Jacek Caban : gdi32: Use NtGdiGetFontFileData for GetFontFileData.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 6dfa2e3740fd791d546d4a5c9b2f20dc428de9e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dfa2e3740fd791d546d4a5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:54:44 2021 +0200 gdi32: Use NtGdiGetFontFileData for GetFontFileData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 9 +++++---- dlls/gdi32/text.c | 9 +++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 90673fb5d24..de3787988d8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6753,9 +6753,10 @@ BOOL WINAPI NtGdiGetRasterizerCaps( RASTERIZER_STATUS *status, UINT size ) } /************************************************************************* - * GetFontFileData (GDI32.@) + * NtGdiGetFontFileData (win32u.@) */ -BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD file_index, UINT64 offset, void *buff, DWORD buff_size ) +BOOL WINAPI NtGdiGetFontFileData( DWORD instance_id, DWORD file_index, UINT64 *offset, + void *buff, DWORD buff_size ) { struct gdi_font *font; DWORD tag = 0, size; @@ -6767,8 +6768,8 @@ BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD file_index, UINT64 offset, { if (font->ttc_item_offset) tag = MS_TTCF_TAG; size = font_funcs->get_font_data( font, tag, 0, NULL, 0 ); - if (size != GDI_ERROR && size >= buff_size && offset <= size - buff_size) - ret = font_funcs->get_font_data( font, tag, offset, buff, buff_size ) != GDI_ERROR; + if (size != GDI_ERROR && size >= buff_size && *offset <= size - buff_size) + ret = font_funcs->get_font_data( font, tag, *offset, buff, buff_size ) != GDI_ERROR; else SetLastError( ERROR_INVALID_PARAMETER ); } diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 98840af111d..22c67e79c71 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1968,3 +1968,12 @@ BOOL WINAPI EnableEUDC( BOOL enable ) FIXME( "(%d): stub\n", enable ); return FALSE; } + +/************************************************************************* + * GetFontFileData (GDI32.@) + */ +BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD file_index, UINT64 offset, + void *buff, DWORD buff_size ) +{ + return NtGdiGetFontFileData( instance_id, file_index, &offset, buff, buff_size ); +}

1 0

Connor McAdams : oleacc: Implement AccessibleObjectFromEvent.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 602a36a2538e356ae8e64b442e9a5ad7f3748bd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=602a36a2538e356ae8e64b44… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Aug 30 11:27:41 2021 -0400 oleacc: Implement AccessibleObjectFromEvent. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index f6b66a8bcab..beceb2ff1fb 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -331,6 +331,53 @@ HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, V return E_NOTIMPL; } +static void variant_init_i4( VARIANT *v, int val ) +{ + V_VT(v) = VT_I4; + V_I4(v) = val; +} + +HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD child_id, + IAccessible **acc_out, VARIANT *child_id_out ) +{ + VARIANT child_id_variant; + IAccessible *acc = NULL; + IDispatch *child = NULL; + HRESULT hr; + + TRACE("%p %d %d %p %p\n", hwnd, object_id, child_id, acc_out, child_id_out); + + if (!acc_out) + return E_INVALIDARG; + *acc_out = NULL; + VariantInit(child_id_out); + + hr = AccessibleObjectFromWindow(hwnd, object_id, &IID_IAccessible, (void **)&acc); + if (FAILED(hr)) + return hr; + + variant_init_i4(&child_id_variant, child_id); + hr = IAccessible_get_accChild(acc, child_id_variant, &child); + if (FAILED(hr)) + TRACE("get_accChild failed with %#x!\n", hr); + + if (SUCCEEDED(hr) && child) + { + IAccessible_Release(acc); + hr = IDispatch_QueryInterface(child, &IID_IAccessible, (void **)&acc); + IDispatch_Release(child); + if (FAILED(hr)) + return hr; + + variant_init_i4(&child_id_variant, CHILDID_SELF); + } + + *acc_out = acc; + *child_id_out = child_id_variant; + + return S_OK; +} + HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 4cff0b8effc..9ad6e915965 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -1,5 +1,5 @@ @ stdcall AccessibleChildren(ptr long long ptr ptr) -@ stub AccessibleObjectFromEvent +@ stdcall AccessibleObjectFromEvent(ptr long long ptr ptr) @ stdcall AccessibleObjectFromPoint(int64 ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) @ stdcall CreateStdAccessibleObject(ptr long ptr ptr)

1 0

Francois Gouget : quartz: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: e950ec2c3be88340f13904a7db62baf3f9ff650a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e950ec2c3be88340f13904a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:22:32 2021 +0200 quartz: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9ecdb280cc6..3a6b7764634 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -283,7 +283,7 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This, return S_OK; } -static HRESULT WINAPI DSoundRender_PrepareReceive(struct dsound_render *This, IMediaSample *pSample) +static HRESULT DSoundRender_PrepareReceive(struct dsound_render *This, IMediaSample *pSample) { HRESULT hr; AM_MEDIA_TYPE *amt; @@ -320,7 +320,7 @@ static HRESULT WINAPI DSoundRender_PrepareReceive(struct dsound_render *This, IM return S_OK; } -static HRESULT WINAPI DSoundRender_DoRenderSample(struct dsound_render *This, IMediaSample *pSample) +static HRESULT DSoundRender_DoRenderSample(struct dsound_render *This, IMediaSample *pSample) { LPBYTE pbSrcStream = NULL; LONG cbSrcStream = 0;

1 0