wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Francois Gouget : shlwapi/tests: Fix some ASCII / ANSI mixups in ok() messages.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 372b5e15a00990c96860329efc6176d249b4f5c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=372b5e15a00990c96860329e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:18:12 2021 +0200 shlwapi/tests: Fix some ASCII / ANSI mixups in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 2e1df632016..9e04c6d7b6f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -668,7 +668,7 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const wszConvertedPart = GetWideString(szPart); ok(lstrcmpW(wszPart,wszConvertedPart)==0, - "Strings didn't match between ascii and unicode UrlGetPart!\n"); + "Strings didn't match between ansi and unicode UrlGetPart!\n"); FreeWideString(wszConvertedPart); } @@ -860,7 +860,7 @@ static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, H wszConvertedUrl = GetWideString(szReturnUrl); ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, - "Strings didn't match between ascii and unicode UrlCanonicalize, index %d!\n", index); + "Strings didn't match between ansi and unicode UrlCanonicalize, index %d!\n", index); FreeWideString(wszConvertedUrl); } @@ -1284,7 +1284,7 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla ok(dwSize == dwExpectLen, "Got length %d, expected %d\n", dwSize, dwExpectLen); if(SUCCEEDED(hr)) { wszConvertedUrl = GetWideString(szReturnUrl); - ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ascii and unicode UrlCombine!\n"); + ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ansi and unicode UrlCombine!\n"); FreeWideString(wszConvertedUrl); } }

1 0

Francois Gouget : shlwapi: Tweak the wording of the _SHStrDupAToBSTR() documentation.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: ab8b99daf4dcbd79f58e552c33f947530647657e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab8b99daf4dcbd79f58e552c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:17:35 2021 +0200 shlwapi: Tweak the wording of the _SHStrDupAToBSTR() documentation. This also fixes an ASCII / ANSI mixup. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index e2c9c6af81f..fc565f45355 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -370,7 +370,7 @@ HRESULT WINAPI StrRetToStrW(LPSTRRET lpStrRet, const ITEMIDLIST *pidl, LPWSTR *p return hRet; } -/* Create an ASCII string copy using SysAllocString() */ +/* Makes a Unicode copy of an ANSI string using SysAllocString() */ static HRESULT _SHStrDupAToBSTR(LPCSTR src, BSTR *pBstrOut) { *pBstrOut = NULL;

1 0

Francois Gouget : shlwapi: Fix ASCII / ANSI mixups in comments.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 25978317ce910037e85bc5723142f700fa095c8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=25978317ce910037e85bc572… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:17:19 2021 +0200 shlwapi: Fix ASCII / ANSI mixups in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/assoc.c | 2 +- dlls/shlwapi/ordinal.c | 6 +++--- dlls/shlwapi/string.c | 34 +++++++++++++++++----------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index e4850d41972..5a9928cc0eb 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); /************************************************************************* * SHLWAPI_ParamAToW * - * Internal helper function: Convert ASCII parameter to Unicode. + * Internal helper function: Convert ANSI parameter to Unicode. */ static BOOL SHLWAPI_ParamAToW(LPCSTR lpszParam, LPWSTR lpszBuff, DWORD dwLen, LPWSTR* lpszOut) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index e73ba6efa7b..52cc3b725fa 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1253,7 +1253,7 @@ static BOOL CALLBACK SHLWAPI_EnumChildProc(HWND hWnd, LPARAM lParam) * Nothing. * * NOTES - * The appropriate ASCII or Unicode function is called for the window. + * The appropriate ANSI or Unicode function is called for the window. */ void WINAPI SHPropagateMessage(HWND hWnd, UINT uiMsgId, WPARAM wParam, LPARAM lParam, BOOL bSend) { @@ -2038,7 +2038,7 @@ void WINAPI SHUnregisterClassesW(HINSTANCE hInst, LPCWSTR *lppClasses, INT iCoun /************************************************************************* * @ [SHLWAPI.240] * - * Call The correct (Ascii/Unicode) default window procedure for a window. + * Call The correct (ANSI/Unicode) default window procedure for a window. * * PARAMS * hWnd [I] Window to call the default procedure for @@ -2264,7 +2264,7 @@ VOID WINAPI SHWeakReleaseInterface(IUnknown *lpDest, IUnknown **lppUnknown) /************************************************************************* * @ [SHLWAPI.269] * - * Convert an ASCII string of a CLSID into a CLSID. + * Convert an ANSI string of a CLSID into a CLSID. * * PARAMS * idstr [I] String representing a CLSID in registry format diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index f4c6ca85d64..e2c9c6af81f 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -539,7 +539,7 @@ LPWSTR WINAPI StrNCatW(LPWSTR lpszStr, LPCWSTR lpszCat, INT cchMax) /************************************************************************* * _SHStrDupAA [INTERNAL] * - * Duplicates a ASCII string to ASCII. The destination buffer is allocated. + * Duplicates a ANSI string to ANSI. The destination buffer is allocated. */ static HRESULT _SHStrDupAA(LPCSTR src, LPSTR * dest) { @@ -606,7 +606,7 @@ HRESULT WINAPI SHStrDupA(LPCSTR lpszStr, LPWSTR * lppszDest) /************************************************************************* * _SHStrDupAW [INTERNAL] * - * Duplicates a UNICODE to a ASCII string. The destination buffer is allocated. + * Duplicates a UNICODE to a ANSI string. The destination buffer is allocated. */ static HRESULT _SHStrDupAW(LPCWSTR src, LPSTR * dest) { @@ -942,7 +942,7 @@ LPSTR WINAPI StrFormatByteSize64A(LONGLONG llBytes, LPSTR lpszDest, UINT cchMax) * lpszDest. * * NOTES - * The Ascii and Unicode versions of this function accept a different + * The ANSI and Unicode versions of this function accept a different * integer type for dwBytes. See StrFormatByteSize64A(). */ LPSTR WINAPI StrFormatByteSizeA(DWORD dwBytes, LPSTR lpszDest, UINT cchMax) @@ -1020,11 +1020,11 @@ WCHAR WINAPI SHStripMneumonicW(LPCWSTR lpszStr) /************************************************************************* * @ [SHLWAPI.216] * - * Convert an Ascii string to Unicode. + * Convert an ANSI string to Unicode. * * PARAMS * dwCp [I] Code page for the conversion - * lpSrcStr [I] Source Ascii string to convert + * lpSrcStr [I] Source ANSI string to convert * lpDstStr [O] Destination for converted Unicode string * iLen [I] Length of lpDstStr * @@ -1043,10 +1043,10 @@ DWORD WINAPI SHAnsiToUnicodeCP(DWORD dwCp, LPCSTR lpSrcStr, LPWSTR lpDstStr, int /************************************************************************* * @ [SHLWAPI.215] * - * Convert an Ascii string to Unicode. + * Convert an ANSI string to Unicode. * * PARAMS - * lpSrcStr [I] Source Ascii string to convert + * lpSrcStr [I] Source ANSI string to convert * lpDstStr [O] Destination for converted Unicode string * iLen [I] Length of lpDstStr * @@ -1064,12 +1064,12 @@ DWORD WINAPI SHAnsiToUnicode(LPCSTR lpSrcStr, LPWSTR lpDstStr, int iLen) /************************************************************************* * @ [SHLWAPI.218] * - * Convert a Unicode string to Ascii. + * Convert a Unicode string to ANSI. * * PARAMS * CodePage [I] Code page to use for the conversion * lpSrcStr [I] Source Unicode string to convert - * lpDstStr [O] Destination for converted Ascii string + * lpDstStr [O] Destination for converted ANSI string * dstlen [I] Length of buffer at lpDstStr * * RETURNS @@ -1167,11 +1167,11 @@ DWORD WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, /************************************************************************* * @ [SHLWAPI.217] * - * Convert a Unicode string to Ascii. + * Convert a Unicode string to ANSI. * * PARAMS * lpSrcStr [I] Source Unicode string to convert - * lpDstStr [O] Destination for converted Ascii string + * lpDstStr [O] Destination for converted ANSI string * iLen [O] Length of lpDstStr in characters * * RETURNS @@ -1188,15 +1188,15 @@ INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen) /************************************************************************* * @ [SHLWAPI.364] * - * Determine if an Ascii string converts to Unicode and back identically. + * Determine if an ANSI string converts to Unicode and back identically. * * PARAMS * lpSrcStr [I] Source Unicode string to convert - * lpDst [O] Destination for resulting Ascii string + * lpDst [O] Destination for resulting ANSI string * iLen [I] Length of lpDst in characters * * RETURNS - * TRUE, since Ascii strings always convert identically. + * TRUE, since ANSI strings always convert identically. */ BOOL WINAPI DoesStringRoundTripA(LPCSTR lpSrcStr, LPSTR lpDst, INT iLen) { @@ -1207,15 +1207,15 @@ BOOL WINAPI DoesStringRoundTripA(LPCSTR lpSrcStr, LPSTR lpDst, INT iLen) /************************************************************************* * @ [SHLWAPI.365] * - * Determine if a Unicode string converts to Ascii and back identically. + * Determine if a Unicode string converts to ANSI and back identically. * * PARAMS * lpSrcStr [I] Source Unicode string to convert - * lpDst [O] Destination for resulting Ascii string + * lpDst [O] Destination for resulting ANSI string * iLen [I] Length of lpDst in characters * * RETURNS - * TRUE, if lpSrcStr converts to Ascii and back identically, + * TRUE, if lpSrcStr converts to ANSI and back identically, * FALSE otherwise. */ BOOL WINAPI DoesStringRoundTripW(LPCWSTR lpSrcStr, LPSTR lpDst, INT iLen)

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.190.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: a16760ac392ba6b0b81fd125dd594e792a887b2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a16760ac392ba6b0b81fd125… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Mon Aug 30 09:51:45 2021 +0200 winevulkan: Update to VK spec version 1.2.190. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 35 ++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 1027 ++++++++++++++++++++------------------- 4 files changed, 577 insertions(+), 489 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a16760ac392ba6b0b81f…

1 0

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

30 Aug '21

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 30 Aug '21

30 Aug '21

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: Use ntgdi names for GetClipBox and GetRandomRgn.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 5a780ffd63547b591c0853b546fdf5132725c8a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a780ffd63547b591c0853b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:56:21 2021 +0200 gdi32: Use ntgdi names for GetClipBox and GetRandomRgn. 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/clipping.c | 10 +++++----- dlls/gdi32/gdi32.spec | 4 ++-- dlls/gdi32/metafile.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 3215d5e9a14..28a314b76b9 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -197,7 +197,7 @@ INT WINAPI NtGdiExtSelectClipRgn( HDC hdc, HRGN rgn, INT mode ) } /*********************************************************************** - * __wine_set_visible_region (GDI32.@) + * __wine_set_visible_region (win32u.@) */ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, const RECT *device_rect, struct window_surface *surface ) @@ -357,9 +357,9 @@ BOOL WINAPI NtGdiRectVisible( HDC hdc, const RECT *rect ) /*********************************************************************** - * GetClipBox (GDI32.@) + * NtGdiGetAppClipBox (win32u.@) */ -INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) +INT WINAPI NtGdiGetAppClipBox( HDC hdc, RECT *rect ) { RECT visrect; INT ret; @@ -440,7 +440,7 @@ INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn ) /*********************************************************************** - * GetRandomRgn [GDI32.@] + * NtGdiGetRandomRgn (win32u.@) * * NOTES * This function is documented in MSDN online for the case of @@ -453,7 +453,7 @@ INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn ) * * See http://www.codeproject.com/gdi/cliprgnguide.asp */ -INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode) +INT WINAPI NtGdiGetRandomRgn( HDC hDC, HRGN hRgn, INT iCode ) { INT ret = 1; DC *dc = get_dc_ptr( hDC ); diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 33ebf828440..4e0f0bf37a3 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -264,7 +264,7 @@ @ stub GetCharWidthWOW @ stdcall GetCharacterPlacementA(long str long long ptr long) @ stdcall GetCharacterPlacementW(long wstr long long ptr long) -@ stdcall GetClipBox(long ptr) +@ stdcall GetClipBox(long ptr) NtGdiGetAppClipBox @ stdcall GetClipRgn(long long) @ stdcall GetColorAdjustment(long ptr) @ stdcall GetColorSpace(long) @@ -332,7 +332,7 @@ @ stdcall GetPixelFormat(long) @ stdcall GetPolyFillMode(long) @ stdcall GetROP2(long) -@ stdcall GetRandomRgn(long long long) +@ stdcall GetRandomRgn(long long long) NtGdiGetRandomRgn @ stdcall GetRasterizerCaps(ptr long) NtGdiGetRasterizerCaps @ stdcall GetRegionData(long long ptr) NtGdiGetRegionData @ stdcall GetRelAbs(long long) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 2059e9baab9..07f467914cc 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1217,7 +1217,7 @@ UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf, UINT ret, full_size; RECT rc; - GetClipBox(hdcRef, &rc); + NtGdiGetAppClipBox(hdcRef, &rc); TRACE("(%p,%d,%p,%d,%p) rc=%s\n", hemf, cbBuffer, lpbBuffer, map_mode, hdcRef, wine_dbgstr_rect(&rc));

1 0

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

30 Aug '21

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: Move EnumFontFamiliesEx wrappers to text.c.
by Alexandre Julliard 30 Aug '21

30 Aug '21

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

Jacek Caban : gdi32: Move GdiRealizationInfo to text.c.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 62a9bae480259fec4d2f4d09149a60cd238eb77a URL: https://source.winehq.org/git/wine.git/?a=commit;h=62a9bae480259fec4d2f4d09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:55:12 2021 +0200 gdi32: Move GdiRealizationInfo 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 | 29 ----------------------------- dlls/gdi32/text.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index de3787988d8..7ba6b3466c4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6807,35 +6807,6 @@ BOOL WINAPI NtGdiGetFontFileInfo( DWORD instance_id, DWORD file_index, struct fo return ret; } -struct realization_info -{ - DWORD flags; /* 1 for bitmap fonts, 3 for scalable fonts */ - DWORD cache_num; /* keeps incrementing - num of fonts that have been created allowing for caching?? */ - DWORD instance_id; /* identifies a realized font instance */ -}; - -/************************************************************* - * GdiRealizationInfo (GDI32.@) - * - * Returns a structure that contains some font information. - */ -BOOL WINAPI GdiRealizationInfo(HDC hdc, struct realization_info *info) -{ - struct font_realization_info ri; - BOOL ret; - - ri.size = sizeof(ri); - ret = NtGdiGetRealizationInfo( hdc, &ri ); - if (ret) - { - info->flags = ri.flags; - info->cache_num = ri.cache_num; - info->instance_id = ri.instance_id; - } - - return ret; -} - /************************************************************* * NtGdiGetCharWidthInfo (win32u.@) */ diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 22c67e79c71..117f5921c9d 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1977,3 +1977,28 @@ BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD file_index, UINT64 offset, { return NtGdiGetFontFileData( instance_id, file_index, &offset, buff, buff_size ); } + +struct realization_info +{ + DWORD flags; /* 1 for bitmap fonts, 3 for scalable fonts */ + DWORD cache_num; /* keeps incrementing - num of fonts that have been created allowing for caching?? */ + DWORD instance_id; /* identifies a realized font instance */ +}; + +/************************************************************* + * GdiRealizationInfo (GDI32.@) + * + * Returns a structure that contains some font information. + */ +BOOL WINAPI GdiRealizationInfo( HDC hdc, struct realization_info *info ) +{ + struct font_realization_info ri; + + ri.size = sizeof(ri); + if (!NtGdiGetRealizationInfo( hdc, &ri )) return FALSE; + + info->flags = ri.flags; + info->cache_num = ri.cache_num; + info->instance_id = ri.instance_id; + return TRUE; +}

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
106
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021