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

Henri Verbeet : vkd3d-compiler: Default to monochrome output when NO_COLOUR/NO_COLOR is set.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: vkd3d Branch: master Commit: 0de7a2eeb5ccff2d8c1e3016fb5f2dec1ad29e9b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0de7a2eeb5ccff2d8c1e301… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 31 01:16:26 2021 +0200 vkd3d-compiler: Default to monochrome output when NO_COLOUR/NO_COLOR is set. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 5 +++++ programs/vkd3d-compiler/main.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README b/README index 3c70ede..ed53f20 100644 --- a/README +++ b/README @@ -45,6 +45,11 @@ removed in the future versions of vkd3d. Some of debug variables are lists of elements. Elements must be separated by commas or semicolons. + * NO_COLOR - this is an alias of NO_COLOUR. + + * NO_COLOUR - when set, vkd3d-compiler will default to monochrome output, + even when the output supports colour. + * VKD3D_CONFIG - a list of options that change the behavior of libvkd3d. * vk_debug - enables Vulkan debug extensions. diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 40e27ed..ac01d59 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -674,7 +674,7 @@ int main(int argc, char **argv) } } - if (!options.explicit_colour && has_colour(output)) + if (!options.explicit_colour && !getenv("NO_COLOUR") && !getenv("NO_COLOR") && has_colour(output)) options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR; add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting);

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Do not swallow compilation errors.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: vkd3d Branch: master Commit: 910aa4df01abfb2460d93e04cf398a946cc9f8e4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=910aa4df01abfb2460d93e0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Aug 30 08:49:25 2021 +0200 vkd3d-shader/hlsl: Do not swallow compilation errors. There are cases where compilation fails, but no error message is recorded. They usually correspond to unimplemented features, but still failure should be forwarded to the caller, otherwise it will manifest itself later in more confusing ways (like not being able to find a function even though it was apparently correctly compiled). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0d9186a..fc9b425 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1803,7 +1803,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d if (!hlsl_ctx_init(&ctx, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; - if (hlsl_lexer_compile(&ctx, hlsl) == 2) + if ((ret = hlsl_lexer_compile(&ctx, hlsl)) == 2) { hlsl_ctx_cleanup(&ctx); return VKD3D_ERROR_OUT_OF_MEMORY; @@ -1815,6 +1815,14 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return ctx.result; } + /* If parsing failed without an error condition being recorded, we + * plausibly hit some unimplemented feature. */ + if (ret) + { + hlsl_ctx_cleanup(&ctx); + return VKD3D_ERROR_NOT_IMPLEMENTED; + } + if (!(entry_func = hlsl_get_func_decl(&ctx, entry_point))) { const struct vkd3d_shader_location loc = {.source_name = compile_info->source_name};

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Cleanup HLSL context during error path.
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: vkd3d Branch: master Commit: 8b6db3d366b7110667ac03d0ce8a3b178253f33e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8b6db3d366b7110667ac03d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Aug 30 08:53:35 2021 +0200 vkd3d-shader/hlsl: Cleanup HLSL context during error path. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index fc9b425..7b246bf 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1829,6 +1829,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d hlsl_error(&ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Entry point \"%s\" is not defined.", entry_point); + hlsl_ctx_cleanup(&ctx); return VKD3D_ERROR_INVALID_SHADER; }

1 0

Henri Verbeet : vkd3d-shader: Use vkd3d_swizzle_get_component() in shader_dump_src_param().
by Alexandre Julliard Aug. 31, 2021

Aug. 31, 2021

Module: vkd3d Branch: master Commit: 5f4fc9cb06e386aabb83eb65fedba903e4c28d1d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5f4fc9cb06e386aabb83eb6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 31 01:16:23 2021 +0200 vkd3d-shader: Use vkd3d_swizzle_get_component() in shader_dump_src_param(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index df0ebf0..26bc788 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1239,11 +1239,12 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, if (param->reg.type != VKD3DSPR_IMMCONST && param->reg.type != VKD3DSPR_IMMCONST64 && param->reg.type != VKD3DSPR_SAMPLER) { + unsigned int swizzle_x = vkd3d_swizzle_get_component(swizzle, 0); + unsigned int swizzle_y = vkd3d_swizzle_get_component(swizzle, 1); + unsigned int swizzle_z = vkd3d_swizzle_get_component(swizzle, 2); + unsigned int swizzle_w = vkd3d_swizzle_get_component(swizzle, 3); + static const char swizzle_chars[] = "xyzw"; - DWORD swizzle_x = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(0)) & VKD3D_SHADER_SWIZZLE_MASK; - DWORD swizzle_y = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(1)) & VKD3D_SHADER_SWIZZLE_MASK; - DWORD swizzle_z = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(2)) & VKD3D_SHADER_SWIZZLE_MASK; - DWORD swizzle_w = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(3)) & VKD3D_SHADER_SWIZZLE_MASK; if (swizzle_x == swizzle_y && swizzle_x == swizzle_z

1 0

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

Aug. 30, 2021

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

Jacek Caban : gdi32: Use ntgdi names for GetClipBox and GetRandomRgn.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

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

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

Aug. 30, 2021

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

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

Aug. 30, 2021

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

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

Aug. 30, 2021

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

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

Aug. 30, 2021

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