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

Henri Verbeet : vkd3d-compiler: Reference --print-target-types in the help text for -b.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: vkd3d Branch: master Commit: 0b293ceae7d2ec8ac3c76dcf9448e01fdcd069f4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0b293ceae7d2ec8ac3c76dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 31 01:16:24 2021 +0200 vkd3d-compiler: Reference --print-target-types in the help text for -b. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 71f90f8..4c7a462 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -161,7 +161,8 @@ static void print_usage(const char *program_name) "[options...] [file]\n" "Options:\n" " -h, --help Display this information and exit.\n" - " -b <type> Specify the target type.\n" + " -b <type> Specify the target type. Use --print-target-types to\n" + " list valid target types for a given source type.\n" " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n"

1 0

Henri Verbeet : vkd3d-compiler: Mention the default target type in the help text for -b.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: vkd3d Branch: master Commit: cc05e9c39124dbb46a9a97979ed5a61686423386 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cc05e9c39124dbb46a9a979… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 31 01:16:25 2021 +0200 vkd3d-compiler: Mention the default target type in the help text for -b. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4c7a462..40e27ed 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -162,7 +162,8 @@ static void print_usage(const char *program_name) "Options:\n" " -h, --help Display this information and exit.\n" " -b <type> Specify the target type. Use --print-target-types to\n" - " list valid target types for a given source type.\n" + " list valid target types for a given source type. The\n" + " default target type is 'spirv-binary'.\n" " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n"

1 0

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

31 Aug '21

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

Henri Verbeet : build: Install the gears and triangle demos.
by Alexandre Julliard 31 Aug '21

31 Aug '21

Module: vkd3d Branch: master Commit: 8cc940df93b2e1f8f7163c6dbc0c486695bad9d0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8cc940df93b2e1f8f7163c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 31 01:16:27 2021 +0200 build: Install the gears and triangle demos. These were originally intended more as documentation than as end-user executables, but there's some value in using them for diagnostic purposes, much like e.g. glxgears. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index c66f7b5..f8385ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,8 +96,8 @@ vkd3d_test_headers = \ tests/d3d12_test_utils.h vkd3d_demos = \ - demos/gears \ - demos/triangle + demos/vkd3d-gears \ + demos/vkd3d-triangle vkd3d_demos_headers = \ demos/demo.h \ @@ -286,13 +286,15 @@ endif if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ -noinst_PROGRAMS = $(vkd3d_demos) +bin_PROGRAMS += $(vkd3d_demos) -demos_gears_CFLAGS = $(DEMOS_CFLAGS) -demos_gears_LDADD = $(DEMOS_LDADD) -lm +demos_vkd3d_gears_SOURCES = demos/gears.c +demos_vkd3d_gears_CFLAGS = $(DEMOS_CFLAGS) +demos_vkd3d_gears_LDADD = $(DEMOS_LDADD) -lm -demos_triangle_CFLAGS = $(DEMOS_CFLAGS) -demos_triangle_LDADD = $(DEMOS_LDADD) +demos_vkd3d_triangle_SOURCES = demos/triangle.c +demos_vkd3d_triangle_CFLAGS = $(DEMOS_CFLAGS) +demos_vkd3d_triangle_LDADD = $(DEMOS_LDADD) endif noinst_HEADERS = $(vkd3d_test_headers) $(vkd3d_demos_headers) @@ -362,7 +364,9 @@ if HAVE_CROSSTARGET32 CROSS32_CC = @CROSSCC32@ CROSS32_DLLTOOL = @CROSSTARGET32(a)-dlltool CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) -CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) $(vkd3d_demos:=.cross32.exe) $(vkd3d_shader_runners:=.cross32.exe) +CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) \ + $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) \ + $(vkd3d_shader_runners:=.cross32.exe) CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) CLEANFILES += $(CROSS32_FILES) @@ -387,7 +391,9 @@ if HAVE_CROSSTARGET64 CROSS64_CC = @CROSSCC64@ CROSS64_DLLTOOL = @CROSSTARGET64(a)-dlltool CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) -CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) $(vkd3d_demos:=.cross64.exe) $(vkd3d_shader_runners:=.cross64.exe) +CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) \ + $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) \ + $(vkd3d_shader_runners:=.cross64.exe) CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) CLEANFILES += $(CROSS64_FILES)

1 0

Jacek Caban : gdi32: Use NtGdiGetFontFileData for GetFontFileData.
by Alexandre Julliard 30 Aug '21

30 Aug '21

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

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

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 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: 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 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