December 2022 - Wine-commits

Alexandre Julliard : png: Import upstream release 1.6.39.
by Alexandre Julliard 06 Dec '22

06 Dec '22

Module: wine Branch: master Commit: 967b29d39dd6046573ce3e99834fb306e0dd1bd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/967b29d39dd6046573ce3e99834fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 16:31:19 2022 +0100 png: Import upstream release 1.6.39. --- libs/png/AUTHORS | 3 ++- libs/png/png.c | 6 +++--- libs/png/png.h | 16 ++++++++-------- libs/png/pngconf.h | 2 +- libs/png/pngpriv.h | 2 +- libs/png/pngread.c | 4 ++-- libs/png/pngrutil.c | 2 +- libs/png/pngwrite.c | 8 ++++---- libs/png/pngwutil.c | 6 +++--- 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/libs/png/AUTHORS b/libs/png/AUTHORS index e6a58d245d6..9a8e3869ec3 100644 --- a/libs/png/AUTHORS +++ b/libs/png/AUTHORS @@ -35,9 +35,10 @@ Authors, for copyright and licensing purposes. * Arm Holdings - Richard Townsend * Google Inc. + - Dan Field + - Leon Scroggins III - Matt Sarett - Mike Klein - - Dan Field - Sami Boukortt The build projects, the build scripts, the test scripts, and other diff --git a/libs/png/png.c b/libs/png/png.c index fc095642621..4f3e8bbd31f 100644 --- a/libs/png/png.c +++ b/libs/png/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_38 Your_png_h_is_not_version_1_6_38; +typedef png_libpng_version_1_6_39 Your_png_h_is_not_version_1_6_39; #ifdef __GNUC__ /* The version tests may need to be added to, but the problem warning has @@ -815,7 +815,7 @@ png_get_copyright(png_const_structrp png_ptr) return PNG_STRING_COPYRIGHT #else return PNG_STRING_NEWLINE \ - "libpng version 1.6.38" PNG_STRING_NEWLINE \ + "libpng version 1.6.39" PNG_STRING_NEWLINE \ "Copyright (c) 2018-2022 Cosmin Truta" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \ PNG_STRING_NEWLINE \ @@ -2710,7 +2710,7 @@ png_check_IHDR(png_const_structrp png_ptr, int /* PRIVATE */ png_check_fp_number(png_const_charp string, size_t size, int *statep, - png_size_tp whereami) + size_t *whereami) { int state = *statep; size_t i = *whereami; diff --git a/libs/png/png.h b/libs/png/png.h index 5fb494fb1aa..f109cdf3365 100644 --- a/libs/png/png.h +++ b/libs/png/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.38 - September 14, 2022 + * libpng version 1.6.39 - November 20, 2022 * * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson @@ -15,7 +15,7 @@ * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger * libpng versions 0.97, January 1998, through 1.6.35, July 2018: * Glenn Randers-Pehrson - * libpng versions 1.6.36, December 2018, through 1.6.38, September 2022: + * libpng versions 1.6.36, December 2018, through 1.6.39, November 2022: * Cosmin Truta * See also "Contributing Authors", below. */ @@ -239,7 +239,7 @@ * ... * 1.5.30 15 10530 15.so.15.30[.0] * ... - * 1.6.38 16 10638 16.so.16.38[.0] + * 1.6.39 16 10639 16.so.16.39[.0] * * Henceforth the source version will match the shared-library major and * minor numbers; the shared-library major version number will be used for @@ -278,8 +278,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.38" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.38 - September 14, 2022\n" +#define PNG_LIBPNG_VER_STRING "1.6.39" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.39 - November 20, 2022\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -287,7 +287,7 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 38 +#define PNG_LIBPNG_VER_RELEASE 39 /* This should be zero for a public release, or non-zero for a * development version. [Deprecated] @@ -318,7 +318,7 @@ * From version 1.0.1 it is: * XXYYZZ, where XX=major, YY=minor, ZZ=release */ -#define PNG_LIBPNG_VER 10638 /* 1.6.38 */ +#define PNG_LIBPNG_VER 10639 /* 1.6.39 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -428,7 +428,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_38; +typedef char* png_libpng_version_1_6_39; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/libs/png/pngconf.h b/libs/png/pngconf.h index 89d28f83a05..fcb4b430698 100644 --- a/libs/png/pngconf.h +++ b/libs/png/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine-configurable file for libpng * - * libpng version 1.6.38 + * libpng version 1.6.39 * * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson diff --git a/libs/png/pngpriv.h b/libs/png/pngpriv.h index 2e426cf47d6..b8a73b685df 100644 --- a/libs/png/pngpriv.h +++ b/libs/png/pngpriv.h @@ -1946,7 +1946,7 @@ PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr, * the problem character.) This has not been tested within libpng. */ PNG_INTERNAL_FUNCTION(int,png_check_fp_number,(png_const_charp string, - size_t size, int *statep, png_size_tp whereami),PNG_EMPTY); + size_t size, int *statep, size_t *whereami),PNG_EMPTY); /* This is the same but it checks a complete string and returns true * only if it just contains a floating point number. As of 1.5.4 this diff --git a/libs/png/pngread.c b/libs/png/pngread.c index 5ab92240382..96996ced5ba 100644 --- a/libs/png/pngread.c +++ b/libs/png/pngread.c @@ -3762,13 +3762,13 @@ png_image_read_direct(png_voidp argument) mode = PNG_ALPHA_PNG; output_gamma = PNG_DEFAULT_sRGB; } - + if ((change & PNG_FORMAT_FLAG_ASSOCIATED_ALPHA) != 0) { mode = PNG_ALPHA_OPTIMIZED; change &= ~PNG_FORMAT_FLAG_ASSOCIATED_ALPHA; } - + /* If 'do_local_background' is set check for the presence of gamma * correction; this is part of the work-round for the libpng bug * described above. diff --git a/libs/png/pngrutil.c b/libs/png/pngrutil.c index ca060dd15f0..068ab193a33 100644 --- a/libs/png/pngrutil.c +++ b/libs/png/pngrutil.c @@ -3186,7 +3186,7 @@ png_check_chunk_length(png_const_structrp png_ptr, png_uint_32 length) { png_debug2(0," length = %lu, limit = %lu", (unsigned long)length,(unsigned long)limit); - png_chunk_error(png_ptr, "chunk data is too large"); + png_benign_error(png_ptr, "chunk data is too large"); } } diff --git a/libs/png/pngwrite.c b/libs/png/pngwrite.c index 06c45d16ab4..4e58d776a96 100644 --- a/libs/png/pngwrite.c +++ b/libs/png/pngwrite.c @@ -75,10 +75,10 @@ write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr, * library. If you have a new chunk to add, make a function to write it, * and put it in the correct location here. If you want the chunk written * after the image data, put it in png_write_end(). I strongly encourage - * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing - * the chunk, as that will keep the code from breaking if you want to just - * write a plain PNG file. If you have long comments, I suggest writing - * them in png_write_end(), and compressing them. + * you to supply a PNG_INFO_<chunk> flag, and check info_ptr->valid before + * writing the chunk, as that will keep the code from breaking if you want + * to just write a plain PNG file. If you have long comments, I suggest + * writing them in png_write_end(), and compressing them. */ void PNGAPI png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr) diff --git a/libs/png/pngwutil.c b/libs/png/pngwutil.c index 16345e4c0ba..01f0607c709 100644 --- a/libs/png/pngwutil.c +++ b/libs/png/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Copyright (c) 2018 Cosmin Truta + * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -1747,7 +1747,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0, { png_uint_32 purpose_len; size_t units_len, total_len; - png_size_tp params_len; + size_t *params_len; png_byte buf[10]; png_byte new_purpose[80]; int i; @@ -1769,7 +1769,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0, png_debug1(3, "pCAL units length = %d", (int)units_len); total_len = purpose_len + units_len + 10; - params_len = (png_size_tp)png_malloc(png_ptr, + params_len = (size_t *)png_malloc(png_ptr, (png_alloc_size_t)((png_alloc_size_t)nparams * (sizeof (size_t)))); /* Find the length of each parameter, making sure we don't count the

1 0

Alexandre Julliard : mpg123: Import upstream release 1.31.1.
by Alexandre Julliard 06 Dec '22

06 Dec '22

Module: wine Branch: master Commit: 36b0e7e0eaa1ebdc647427bb5dbab329d0e4b694 URL: https://gitlab.winehq.org/wine/wine/-/commit/36b0e7e0eaa1ebdc647427bb5dbab3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 16:44:26 2022 +0100 mpg123: Import upstream release 1.31.1. --- libs/mpg123/config.h | 31 +++++++++++++++++++++++++------ libs/mpg123/src/intsym.h | 6 +----- libs/mpg123/src/libmpg123/mpg123.h | 2 +- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/libs/mpg123/config.h b/libs/mpg123/config.h index 5e45528c423..f030455e464 100644 --- a/libs/mpg123/config.h +++ b/libs/mpg123/config.h @@ -20,6 +20,10 @@ /* Define if .align takes 3 for alignment of 2^3=8 bytes instead of 8. */ /* #undef ASMALIGN_EXP */ +/* No suffixed symbols for large file support (only alias for backwards + compat.) */ +#define BUILD_NO_LARGENAME 1 + /* Define if __attribute__((aligned(16))) shall be used */ #define CCALIGN 1 @@ -188,6 +192,9 @@ /* Define to 1 if you have the `sched_setscheduler' function. */ /* #undef HAVE_SCHED_SETSCHEDULER */ +/* Define to 1 if you have the `setenv' function. */ +/* #undef HAVE_SETENV */ + /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 @@ -215,9 +222,6 @@ /* Define to 1 if you have the <signal.h> header file. */ #define HAVE_SIGNAL_H 1 -/* Define to 1 if you have the <sndio.h> header file. */ -/* #undef HAVE_SNDIO_H */ - /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 @@ -290,6 +294,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 +/* Define to 1 if you have the `unsetenv' function. */ +/* #undef HAVE_UNSETENV */ + /* Define to 1 if you have the <wchar.h> header file. */ #define HAVE_WCHAR_H 1 @@ -302,6 +309,9 @@ /* Define to 1 if you have the <wctype.h> header file. */ #define HAVE_WCTYPE_H 1 +/* Define to 1 if you have the <wincon.h> header file. */ +#define HAVE_WINCON_H 1 + /* Define to 1 if you have the <windows.h> header file. */ #define HAVE_WINDOWS_H 1 @@ -339,6 +349,15 @@ /* Define to for new net123 network stack. */ /* #undef NET123 */ +/* Define for executable-based networking (for HTTPS). */ +/* #undef NET123_EXEC */ + +/* Define for winhttp networking (for HTTPS). */ +#define NET123_WINHTTP 1 + +/* Define for wininet networking (for HTTPS). */ +/* #undef NET123_WININET */ + /* Define if network support is enabled. */ /* #undef NETWORK */ @@ -410,7 +429,7 @@ #define PACKAGE_NAME "mpg123" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "mpg123 1.30.2" +#define PACKAGE_STRING "mpg123 1.31.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mpg123" @@ -419,7 +438,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.30.2" +#define PACKAGE_VERSION "1.31.1" /* Define if portaudio v18 API is wanted. */ /* #undef PORTAUDIO18 */ @@ -461,7 +480,7 @@ /* #undef USE_YASM_FOR_AVX */ /* Version number of package */ -#define VERSION "1.30.2" +#define VERSION "1.31.1" /* Define to use Win32 named pipes */ #define WANT_WIN32_FIFO 1 diff --git a/libs/mpg123/src/intsym.h b/libs/mpg123/src/intsym.h index 7c817e3a755..cc975d41865 100644 --- a/libs/mpg123/src/intsym.h +++ b/libs/mpg123/src/intsym.h @@ -16,6 +16,7 @@ #define compat_fdopen INT123_compat_fdopen #define compat_close INT123_compat_close #define compat_fclose INT123_compat_fclose +#define compat_binmode INT123_compat_binmode #define win32_wide_utf8 INT123_win32_wide_utf8 #define win32_wide_utf7 INT123_win32_wide_utf7 #define win32_utf8_wide INT123_win32_utf8_wide @@ -277,9 +278,6 @@ #define buffer_drop INT123_buffer_drop #define buffer_write INT123_buffer_write #define buffer_fill INT123_buffer_fill -#define read_buf INT123_read_buf -#define xfer_write_string INT123_xfer_write_string -#define xfer_read_string INT123_xfer_read_string #define xfermem_init INT123_xfermem_init #define xfermem_init_writer INT123_xfermem_init_writer #define xfermem_init_reader INT123_xfermem_init_reader @@ -304,8 +302,6 @@ #define raw_formats INT123_raw_formats #define wav_formats INT123_wav_formats #define wav_drain INT123_wav_drain -#define write_parameters INT123_write_parameters -#define read_parameters INT123_read_parameters #define stringlists_add INT123_stringlists_add #define check_neon INT123_check_neon #define dct64_3dnow INT123_dct64_3dnow diff --git a/libs/mpg123/src/libmpg123/mpg123.h b/libs/mpg123/src/libmpg123/mpg123.h index 6b96e7a50b4..19eca55ec9e 100644 --- a/libs/mpg123/src/libmpg123/mpg123.h +++ b/libs/mpg123/src/libmpg123/mpg123.h @@ -1,5 +1,5 @@ /* - libmpg123: MPEG Audio Decoder library (version 1.30.2) + libmpg123: MPEG Audio Decoder library (version 1.31.1) copyright 1995-2015 by the mpg123 project free software under the terms of the LGPL 2.1

1 0

Alexandre Julliard : kernelbase: Update timezone data to version 2022g.
by Alexandre Julliard 06 Dec '22

06 Dec '22

Module: wine Branch: master Commit: a90df92a3c99d9409fb9720ba85b8781cf44bcb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a90df92a3c99d9409fb9720ba85b87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 16:59:25 2022 +0100 kernelbase: Update timezone data to version 2022g. --- dlls/kernelbase/kernelbase.rgs | 17 ++++++----------- tools/make_unicode | 4 ++-- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index 136744ef129..7e36eb4cf21 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -1047,9 +1047,10 @@ HKLM val 'MUI_Dlt' = s '@tzres.dll,-58097' val 'MUI_Std' = s '@tzres.dll,-58096' val 'Std' = s 'Greenland Standard Time' - val 'TZI' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 + val 'TZI' = b 7800000000000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 'Dynamic DST' { + val '2000' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 val '2001' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060004001600000000000000 val '2002' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 val '2003' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 @@ -1072,16 +1073,10 @@ HKLM val '2020' = b b400000000000000c4ffffff00000a0006000400170000000000000000000300060005001600000000000000 val '2021' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 val '2022' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2023' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2024' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2025' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2026' = b b400000000000000c4ffffff00000a0006000400170000000000000000000300060005001600000000000000 - val '2027' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2028' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2029' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060004001600000000000000 - val '2030' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val 'FirstEntry' = d 2001 - val 'LastEntry' = d 2030 + val '2023' = b b400000000000000c4ffffff0000010000000100000000000000000000000300060005001600000000000000 + val '2024' = b 7800000000000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val 'FirstEntry' = d 2000 + val 'LastEntry' = d 2024 } } 'Greenwich Standard Time' diff --git a/tools/make_unicode b/tools/make_unicode index ec9647e07f4..2d1a90fafbc 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -28,7 +28,7 @@ use Time::Local qw(timegm_modern); my $UNIVERSION = "15.0.0"; my $CLDRVERSION = "42"; my $ISO639VERSION = "20220120"; -my $TZVERSION = "2022f"; +my $TZVERSION = "2022g"; my %data_files = ( @@ -55,7 +55,7 @@ my %data_files = jis0212 => { url => "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0212.TXT", sha => "477820bb3055bbcc90880d788cd95607d221dc94457bae249231adecf13c12e6" }, tzdata => { url => "https://data.iana.org/time-zones/releases/tzdata$TZVERSION.tar.gz", - sha => "9990d71f675d212567b931fe8aae1cab7027f89fefb8a79d808a6933a67af000" }, + sha => "4491db8281ae94a84d939e427bdd83dc389f26764d27d9a5c52d782c16764478" }, );

1 0

Alexandre Julliard : opengl32: Fix GLdouble type alignment on the Unix side.
by Alexandre Julliard 06 Dec '22

06 Dec '22

Module: wine Branch: master Commit: 288da7c8dbea52ed4312885f0be9ffec27e307e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/288da7c8dbea52ed4312885f0be9ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 13:29:18 2022 +0100 opengl32: Fix GLdouble type alignment on the Unix side. --- dlls/glu32/project.c | 10 +++++----- dlls/opengl32/make_opengl | 1 + include/wine/wgl.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/glu32/project.c b/dlls/glu32/project.c index 0a71eabd98c..2533ba28f42 100644 --- a/dlls/glu32/project.c +++ b/dlls/glu32/project.c @@ -241,8 +241,8 @@ GLint WINAPI gluProject( GLdouble objx, GLdouble objy, GLdouble objz, const GLdo const GLdouble projMatrix[16], const GLint viewport[4], GLdouble *winx, GLdouble *winy, GLdouble *winz ) { - double in[4]; - double out[4]; + GLdouble in[4]; + GLdouble out[4]; in[0]=objx; in[1]=objy; @@ -276,9 +276,9 @@ GLint WINAPI gluUnProject( GLdouble winx, GLdouble winy, GLdouble winz, const GL const GLdouble projMatrix[16], const GLint viewport[4], GLdouble *objx, GLdouble *objy, GLdouble *objz ) { - double finalMatrix[16]; - double in[4]; - double out[4]; + GLdouble finalMatrix[16]; + GLdouble in[4]; + GLdouble out[4]; __gluMultMatricesd(modelMatrix, projMatrix, finalMatrix); if (!__gluInvertMatrixd(finalMatrix, finalMatrix)) return(GL_FALSE); diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 5564b4b8526..4f93725bb29 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -133,6 +133,7 @@ my %remap_types = my %khronos_types = ( + "double" => "double DECLSPEC_ALIGN(8)", "khronos_int8_t" => "signed char", "khronos_uint8_t" => "unsigned char", "khronos_int16_t" => "short", diff --git a/include/wine/wgl.h b/include/wine/wgl.h index 51b821f5594..b3f93fab9ca 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -21,8 +21,8 @@ typedef int GLclampx; typedef int GLsizei; typedef float GLfloat; typedef float GLclampf; -typedef double GLdouble; -typedef double GLclampd; +typedef double DECLSPEC_ALIGN(8) GLdouble; +typedef double DECLSPEC_ALIGN(8) GLclampd; typedef void *GLeglClientBufferEXT; typedef void *GLeglImageOES; typedef char GLchar;

1 0

Eric Pouech : wined3d: Transfer long types' enabling at file level.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: a942b560525cc47275f34f32c80e147c10a5c8ab URL: https://gitlab.winehq.org/wine/wine/-/commit/a942b560525cc47275f34f32c80e14… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 3 09:59:11 2022 +0100 wined3d: Transfer long types' enabling at file level. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/ati_fragment_shader.c | 1 + dlls/wined3d/buffer.c | 1 + dlls/wined3d/context_gl.c | 1 + dlls/wined3d/cs.c | 1 + dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/nvidia_texture_shader.c | 1 + dlls/wined3d/palette.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm1.c | 1 + dlls/wined3d/shader_sm4.c | 1 + dlls/wined3d/state.c | 1 + dlls/wined3d/stateblock.c | 1 + dlls/wined3d/surface.c | 1 + dlls/wined3d/swapchain.c | 1 + dlls/wined3d/texture.c | 1 + dlls/wined3d/utils.c | 1 + dlls/wined3d/vertexdeclaration.c | 1 + dlls/wined3d/view.c | 1 + dlls/wined3d/wined3d_main.c | 1 + 25 files changed, 24 insertions(+), 1 deletion(-)

1 0

Eric Pouech : wined3d: Store GetLastError() into an unsigned int.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 13848df407825b49add53ee696a3387bffcb3800 URL: https://gitlab.winehq.org/wine/wine/-/commit/13848df407825b49add53ee696a338… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 3 09:59:12 2022 +0100 wined3d: Store GetLastError() into an unsigned int. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/context_gl.c | 4 ++-- dlls/wined3d/wined3d_main.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2d2867b638e..8353a10a87a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -264,7 +264,7 @@ static void wined3d_caps_gl_ctx_destroy(const struct wined3d_caps_gl_ctx *ctx) if (!wglDeleteContext(ctx->gl_ctx)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx->gl_ctx, err); } diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9ddcc9a40d2..689b76fe64e 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1543,7 +1543,7 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) if (!wglDeleteContext(context_gl->gl_ctx)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to delete GL context %p, last error %#x.\n", context_gl->gl_ctx, err); } @@ -1615,7 +1615,7 @@ BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) TRACE("Clearing current D3D context.\n"); if (!wglMakeCurrent(NULL, NULL)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to clear current GL context, last error %#x.\n", err); TlsSetValue(wined3d_context_tls_idx, NULL); return FALSE; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index b52891c631e..2837503f574 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -275,7 +275,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_context_tls_idx = TlsAlloc(); if (wined3d_context_tls_idx == TLS_OUT_OF_INDEXES) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to allocate context TLS index, err %#x.\n", err); return FALSE; } @@ -300,7 +300,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR("Failed to register window class 'WineD3D_OpenGL'!\n"); if (!TlsFree(wined3d_context_tls_idx)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to free context TLS index, err %#x.\n", err); } return FALSE; @@ -502,7 +502,7 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) if (!TlsFree(wined3d_context_tls_idx)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to free context TLS index, err %#x.\n", err); }

1 0

Eric Pouech : wined3d: Enable long types in adapter_vk.c.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 6673ad3a83f9ab28259576feb6d1203d587bdbab URL: https://gitlab.winehq.org/wine/wine/-/commit/6673ad3a83f9ab28259576feb6d120… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 3 09:59:14 2022 +0100 wined3d: Enable long types in adapter_vk.c. --- dlls/wined3d/adapter_vk.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 213d87a8738..f7902dfb498 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -15,7 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" @@ -496,7 +495,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi if (FAILED(hr = wined3d_device_init(&device_vk->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, vk_info->supported, device_parent))) { - WARN("Failed to initialize device, hr %#x.\n", hr); + WARN("Failed to initialize device, hr %#lx.\n", hr); wined3d_allocator_cleanup(&device_vk->allocator); goto fail; } @@ -676,7 +675,7 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) if (FAILED(hr = device->shader_backend->shader_alloc_private(device, device->adapter->vertex_pipe, device->adapter->fragment_pipe))) { - ERR("Failed to allocate shader private data, hr %#x.\n", hr); + ERR("Failed to allocate shader private data, hr %#lx.\n", hr); wined3d_context_vk_cleanup(context_vk); return hr; } @@ -1300,7 +1299,7 @@ static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, if (FAILED(hr = wined3d_swapchain_vk_init(swapchain_vk, device, desc, state_parent, parent, parent_ops))) { - WARN("Failed to initialise swapchain, hr %#x.\n", hr); + WARN("Failed to initialise swapchain, hr %#lx.\n", hr); heap_free(swapchain_vk); return hr; } @@ -1351,7 +1350,7 @@ static HRESULT adapter_vk_create_buffer(struct wined3d_device *device, if (FAILED(hr = wined3d_buffer_vk_init(buffer_vk, device, desc, data, parent, parent_ops))) { - WARN("Failed to initialise buffer, hr %#x.\n", hr); + WARN("Failed to initialise buffer, hr %#lx.\n", hr); heap_free(buffer_vk); return hr; } @@ -1398,7 +1397,7 @@ static HRESULT adapter_vk_create_texture(struct wined3d_device *device, if (FAILED(hr = wined3d_texture_vk_init(texture_vk, device, desc, layer_count, level_count, flags, parent, parent_ops))) { - WARN("Failed to initialise texture, hr %#x.\n", hr); + WARN("Failed to initialise texture, hr %#lx.\n", hr); heap_free(texture_vk); return hr; } @@ -1449,7 +1448,7 @@ static HRESULT adapter_vk_create_rendertarget_view(const struct wined3d_view_des if (FAILED(hr = wined3d_rendertarget_view_vk_init(view_vk, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_vk); return hr; } @@ -1591,7 +1590,7 @@ static HRESULT adapter_vk_create_shader_resource_view(const struct wined3d_view_ if (FAILED(hr = wined3d_shader_resource_view_vk_init(view_vk, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_vk); return hr; } @@ -1644,7 +1643,7 @@ static HRESULT adapter_vk_create_unordered_access_view(const struct wined3d_view if (FAILED(hr = wined3d_unordered_access_view_vk_init(view_vk, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_vk); return hr; }

1 0

Eric Pouech : wined3d: Enable long types in ati_fragment_shader.c.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 9c06b575ba688a0f759eeafcaaeeb911d8191257 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c06b575ba688a0f759eeafcaaeeb9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 3 09:59:15 2022 +0100 wined3d: Enable long types in ati_fragment_shader.c. --- dlls/wined3d/ati_fragment_shader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 2ef05c3c0f6..46fa5d4d64f 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include <stdio.h> @@ -258,7 +257,7 @@ static void wrap_op3(const struct wined3d_gl_info *gl_info, GLuint op, GLuint ds } } -static GLuint register_for_arg(DWORD arg, const struct wined3d_gl_info *gl_info, +static GLuint register_for_arg(unsigned int arg, const struct wined3d_gl_info *gl_info, unsigned int stage, GLuint *mod, GLuint *rep, GLuint tmparg) { GLenum ret;

1 0

Eric Pouech : wined3d: Reduce long integral type usage in wined3d_main.c.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 6e33aa220029a69d771acd6e6e2b05f092bc2f68 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e33aa220029a69d771acd6e6e2b05… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 3 09:59:17 2022 +0100 wined3d: Reduce long integral type usage in wined3d_main.c. --- dlls/wined3d/wined3d_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2837503f574..68114256cf1 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -204,7 +204,7 @@ static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *env, const cha return ERROR_FILE_NOT_FOUND; } -static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *env, const char *name, DWORD *value) +static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *env, const char *name, unsigned int *value) { DWORD type, data, size; const char *env_value; @@ -269,7 +269,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) const char *env; HKEY hkey = 0; HKEY appkey = 0; - DWORD tmpvalue; + unsigned int tmpvalue; WNDCLASSA wc; wined3d_context_tls_idx = TlsAlloc();

1 0

Eric Pouech : wined3d: Enable long types in wined3d_main.c.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 47f280cae6f911411c448419bf57866e846e5c9b URL: https://gitlab.winehq.org/wine/wine/-/commit/47f280cae6f911411c448419bf5786… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 3 09:59:18 2022 +0100 wined3d: Enable long types in wined3d_main.c. --- dlls/wined3d/wined3d_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 68114256cf1..bcaf1651db8 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -21,7 +21,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES @@ -146,7 +145,7 @@ struct wined3d * CDECL wined3d_create(uint32_t flags) if (FAILED(hr = wined3d_init(object, flags))) { - WARN("Failed to initialize wined3d object, hr %#x.\n", hr); + WARN("Failed to initialize wined3d object, hr %#lx.\n", hr); heap_free(object); return NULL; } @@ -570,7 +569,7 @@ static struct wined3d_output * wined3d_get_output_from_window(const struct wined monitor_info.cbSize = sizeof(monitor_info); if (!GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info)) { - ERR("GetMonitorInfoW failed, error %#x.\n", GetLastError()); + ERR("GetMonitorInfoW failed, error %#lx.\n", GetLastError()); return NULL; }

1 0