wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Alexandre Julliard : dbghelp: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 341feeb10eddd3d139c4c206a43db80d0671ff3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=341feeb10eddd3d139c4c206… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 14:25:07 2020 +0200 dbghelp: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 0f0aa25e76..4dcbd41f26 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2682,7 +2682,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, { ptr = (const char*)imp + sizeof(*imp) + strlen(imp->filename); if (i >= CV_MAX_MODULES) FIXME("Out of bounds!!!\n"); - if (!_strnicmp(pdb_lookup->filename, imp->filename, -1)) + if (!stricmp(pdb_lookup->filename, imp->filename)) { if (module_index != -1) FIXME("Twice the entry\n"); else module_index = i; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index a5219532b9..d6f297a213 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -127,7 +127,7 @@ static BOOL pe_find_section(struct image_file_map* fmap, const char* name, sectname = memcpy(tmp, sectname, IMAGE_SIZEOF_SHORT_NAME); tmp[IMAGE_SIZEOF_SHORT_NAME] = '\0'; } - if (!_strnicmp(sectname, name, -1)) + if (!stricmp(sectname, name)) { ism->fmap = fmap; ism->sidx = i;

1 0

Alexandre Julliard : dbghelp: Make qsort callback explicitly cdecl.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 0163db5152124efbd1a5ba46aa52a6da66d897d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0163db5152124efbd1a5ba46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 09:14:17 2020 +0200 dbghelp: Make qsort callback explicitly cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/symbol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 08986881a9..67cb04c0d9 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -720,7 +720,7 @@ extern DWORD64 sw_module_base(struct cpu_stack_walk* csw, DWORD64 addr) DEC extern const char* symt_get_name(const struct symt* sym) DECLSPEC_HIDDEN; extern WCHAR* symt_get_nameW(const struct symt* sym) DECLSPEC_HIDDEN; extern BOOL symt_get_address(const struct symt* type, ULONG64* addr) DECLSPEC_HIDDEN; -extern int symt_cmp_addr(const void* p1, const void* p2) DECLSPEC_HIDDEN; +extern int __cdecl symt_cmp_addr(const void* p1, const void* p2) DECLSPEC_HIDDEN; extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) DECLSPEC_HIDDEN; extern struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index bcb26ee704..706d088aec 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -51,7 +51,7 @@ static inline int cmp_sorttab_addr(struct module* module, int idx, ULONG64 addr) return cmp_addr(ref, addr); } -int symt_cmp_addr(const void* p1, const void* p2) +int __cdecl symt_cmp_addr(const void* p1, const void* p2) { const struct symt* sym1 = *(const struct symt* const *)p1; const struct symt* sym2 = *(const struct symt* const *)p2;

1 0

Jacek Caban : configure: Get rid of no longer needed zlib checks.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 4f84cc454ae6f324f46477343a25a2cfb14d2c33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f84cc454ae6f324f4647734… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 23:42:29 2020 +0200 configure: Get rid of no longer needed zlib checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 107 ---------------------------------------------------- configure.ac | 13 ------- include/config.h.in | 6 --- 3 files changed, 126 deletions(-) diff --git a/configure b/configure index 6db2725807..75327beacf 100755 --- a/configure +++ b/configure @@ -673,8 +673,6 @@ GSTREAMER_CFLAGS PULSE_LIBS PULSE_CFLAGS GETTEXTPO_LIBS -Z_LIBS -Z_CFLAGS FREETYPE_LIBS FREETYPE_CFLAGS LCMS2_LIBS @@ -898,7 +896,6 @@ with_xshape with_xshm with_xslt with_xxf86vm -with_zlib with_wine_tools with_wine64 enable_largefile @@ -1866,8 +1863,6 @@ LCMS2_CFLAGS LCMS2_LIBS FREETYPE_CFLAGS FREETYPE_LIBS -Z_CFLAGS -Z_LIBS PULSE_CFLAGS PULSE_LIBS GSTREAMER_CFLAGS @@ -2602,7 +2597,6 @@ Optional Packages: --without-xshm do not use XShm (shared memory extension) --without-xslt do not use XSLT --without-xxf86vm do not use XFree video mode extension - --without-zlib do not use Zlib (data compression) --with-wine-tools=DIR use Wine tools from directory DIR --with-wine64=DIR use the 64-bit Wine in DIR for a Wow64 build --with-x use the X Window System @@ -2654,8 +2648,6 @@ Some influential environment variables: C compiler flags for freetype2, overriding pkg-config FREETYPE_LIBS Linker flags for freetype2, overriding pkg-config - Z_CFLAGS C compiler flags for libz, overriding pkg-config - Z_LIBS Linker flags for libz, overriding pkg-config PULSE_CFLAGS C compiler flags for libpulse, overriding pkg-config PULSE_LIBS Linker flags for libpulse, overriding pkg-config @@ -4212,12 +4204,6 @@ if test "${with_xxf86vm+set}" = set; then : fi -# Check whether --with-zlib was given. -if test "${with_zlib+set}" = set; then : - withval=$with_zlib; -fi - - # Check whether --with-wine-tools was given. if test "${with_wine_tools+set}" = set; then : @@ -14477,97 +14463,6 @@ done LIBS="$ac_wine_check_funcs_save_LIBS" -if test "x$with_zlib" != "xno" -then - if ${Z_CFLAGS:+false} :; then : - if ${PKG_CONFIG+:} false; then : - Z_CFLAGS=`$PKG_CONFIG --cflags libz 2>/dev/null` -fi -fi - -if ${Z_LIBS:+false} :; then : - if ${PKG_CONFIG+:} false; then : - Z_LIBS=`$PKG_CONFIG --libs libz 2>/dev/null` -fi -fi - -Z_LIBS=${Z_LIBS:-"-lz"} -$as_echo "$as_me:${as_lineno-$LINENO}: libz cflags: $Z_CFLAGS" >&5 -$as_echo "$as_me:${as_lineno-$LINENO}: libz libs: $Z_LIBS" >&5 -ac_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $Z_CFLAGS" -for ac_header in zlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" -if test "x$ac_cv_header_zlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ZLIB_H 1 -_ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5 -$as_echo_n "checking for inflate in -lz... " >&6; } -if ${ac_cv_lib_z_inflate+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lz $Z_LIBS $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char inflate (); -int -main () -{ -return inflate (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_z_inflate=yes -else - ac_cv_lib_z_inflate=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5 -$as_echo "$ac_cv_lib_z_inflate" >&6; } -if test "x$ac_cv_lib_z_inflate" = xyes; then : - -$as_echo "#define HAVE_ZLIB 1" >>confdefs.h - -else - Z_LIBS="" -fi - -else - Z_LIBS="" -fi - -done - -CPPFLAGS=$ac_save_CPPFLAGS -test -z "$Z_CFLAGS" || Z_CFLAGS=`echo " $Z_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` -test -z "$Z_LIBS" || Z_LIBS=`echo " $Z_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` - -fi -if test "x$Z_LIBS" = "x"; then : - case "x$with_zlib" in - x) as_fn_append wine_notices "|libz ${notice_platform}development files not found, data compression won't be supported." ;; - xno) ;; - *) as_fn_error $? "libz ${notice_platform}development files not found, data compression won't be supported. -This is an error since --with-zlib was requested." "$LINENO" 5 ;; -esac - -fi - if test "x$enable_tools" != xno -a "x$with_gettextpo" = xyes then if test "$ac_cv_header_gettext_po_h" = "yes" @@ -20011,8 +19906,6 @@ LCMS2_CFLAGS = $LCMS2_CFLAGS LCMS2_LIBS = $LCMS2_LIBS FREETYPE_CFLAGS = $FREETYPE_CFLAGS FREETYPE_LIBS = $FREETYPE_LIBS -Z_CFLAGS = $Z_CFLAGS -Z_LIBS = $Z_LIBS GETTEXTPO_LIBS = $GETTEXTPO_LIBS PULSE_CFLAGS = $PULSE_CFLAGS PULSE_LIBS = $PULSE_LIBS diff --git a/configure.ac b/configure.ac index 9e29234b42..e65f2d33ca 100644 --- a/configure.ac +++ b/configure.ac @@ -111,7 +111,6 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT])) AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) -AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)])) AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) @@ -1596,18 +1595,6 @@ WINE_CHECK_LIB_FUNCS(\ pthread_getthreadid_np, [$PTHREAD_LIBS]) -dnl **** Check for zlib **** -if test "x$with_zlib" != "xno" -then - WINE_PACKAGE_FLAGS(Z,[libz],[-lz],,, - [AC_CHECK_HEADERS(zlib.h, - [AC_CHECK_LIB(z,inflate, - [AC_DEFINE(HAVE_ZLIB,1,[Define to 1 if you have the `z' library (-lz).])], - [Z_LIBS=""],[$Z_LIBS])], - [Z_LIBS=""])]) -fi -WINE_NOTICE_WITH(zlib,[test "x$Z_LIBS" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.]) - dnl **** Check for gettextpo **** if test "x$enable_tools" != xno -a "x$with_gettextpo" = xyes then diff --git a/include/config.h.in b/include/config.h.in index 8ccbf0e7e5..8cbf8db09a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1291,12 +1291,6 @@ /* Define to 1 if you have the `yn' function. */ #undef HAVE_YN -/* Define to 1 if you have the `z' library (-lz). */ -#undef HAVE_ZLIB - -/* Define to 1 if you have the <zlib.h> header file. */ -#undef HAVE_ZLIB_H - /* Define to 1 if you have the `_spawnvp' function. */ #undef HAVE__SPAWNVP

1 0

Jacek Caban : dbghelp: Get rid of no longer needed #ifdefs.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: e014d325ddb87dbb4678ef47ef17f9e7f49b0248 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e014d325ddb87dbb4678ef47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 23:42:15 2020 +0200 dbghelp: Get rid of no longer needed #ifdefs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/stabs.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index e14e154cba..b1b4a6ef1c 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -51,33 +51,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); /* Masks for n_type field */ -#ifndef N_STAB #define N_STAB 0xe0 -#endif -#ifndef N_PEXT #define N_PEXT 0x10 -#endif -#ifndef N_TYPE #define N_TYPE 0x1e -#endif -#ifndef N_EXT #define N_EXT 0x01 -#endif /* Values for (n_type & N_TYPE) */ -#ifndef N_UNDF #define N_UNDF 0x00 -#endif -#ifndef N_ABS #define N_ABS 0x02 -#endif -#ifndef N_INDR #define N_INDR 0x0a -#endif -#ifndef N_SECT #define N_SECT 0x0e -#endif - #define N_GSYM 0x20 #define N_FUN 0x24 #define N_STSYM 0x26

1 0

Jacek Caban : dbghelp: Get rid of no longer needed HAVE_ZLIB checks.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 6b1bc0beac510aa48a848b8182b9310f92609dd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b1bc0beac510aa48a848b81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 23:42:01 2020 +0200 dbghelp: Get rid of no longer needed HAVE_ZLIB checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5925a00bfe..53274c4f59 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3363,7 +3363,6 @@ static void dwarf2_location_compute(struct process* pcs, } } -#ifdef HAVE_ZLIB static void *zalloc(void *priv, uInt items, uInt sz) { return HeapAlloc(GetProcessHeap(), 0, items * sz); @@ -3445,8 +3444,6 @@ out: return ret; } -#endif - static inline BOOL dwarf2_init_section(dwarf2_section_t* section, struct image_file_map* fmap, const char* sectname, const char* zsectname, struct image_section_map* ism) @@ -3470,11 +3467,7 @@ static inline BOOL dwarf2_init_section(dwarf2_section_t* section, struct image_f if (zsectname && image_find_section(fmap, zsectname, ism)) { -#ifdef HAVE_ZLIB return dwarf2_init_zsection(section, zsectname, ism); -#else - FIXME("dbghelp not built with zlib, but compressed section found\n" ); -#endif } return FALSE;

1 0

Francois Gouget : testbot/Janitor: Allow 31 character session ids.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: tools Branch: master Commit: 7171288cf54f9cb7d6b236867022df7ea4dde8c1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7171288cf54f9cb7d6b2368… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 7 01:50:03 2020 +0200 testbot/Janitor: Allow 31 character session ids. Some users still have obsolete 31 character session ids that have not expired yet. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 8fa1782..35a7e5d 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -272,7 +272,8 @@ if (opendir(my $dh, "$DataDir/staging")) my $Age = int((-M $FileName) + 0.5); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; - if ($Entry =~ /^[0-9a-f]{32}-websubmit2?_/) + # FIXME: There are still some obsolete unexpired 31 characters session ids. + if ($Entry =~ /^[0-9a-f]{31,32}-websubmit2?_/) { # We get these files whenever a developer abandons a job submission. # So just delete them silently after a day.

1 0

Francois Gouget : testbot/build: Don't compile Wine with -Werror.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: tools Branch: master Commit: 360bd7fd13f65ac3fc43311b778de62dad5c2a2b URL: https://source.winehq.org/git/tools.git/?a=commit;h=360bd7fd13f65ac3fc43311… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 7 01:49:55 2020 +0200 testbot/build: Don't compile Wine with -Werror. While the mailing list patches should be compiled with -Werror, the manually submitted jobs should be given more leeway so developers are not hampered when just doing a quick test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 1 - testbot/bin/build/WineReconfig.pl | 1 - 2 files changed, 2 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index b72fa73..458b5da 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -55,7 +55,6 @@ sub UpdateWineBuilds($$) { my ($TaskMissions, $Flags) = @_; - $Flags |= $Build::Utils::TRY_WERROR; my $Configure = "--without-x --without-freetype --disable-winetest"; return BuildWine($TaskMissions, $Flags, "exe32", $Configure, "buildtests") && diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 0c64fc3..f9f6792 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -54,7 +54,6 @@ sub UpdateWineBuilds($$) { my ($TaskMissions, $Flags) = @_; - $Flags |= $Build::Utils::TRY_WERROR; return BuildWine($TaskMissions, $Flags, "win32", "") && BuildWine($TaskMissions, $Flags, "wow64", "--enable-win64") && BuildWine($TaskMissions, $Flags, "wow32", "--with-wine64=".

1 0

Andrew Eikum : winmm/tests: Test mmioOpen with long file name.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: ca092dcf819174699f9bb1af45a285dff2f6ac81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca092dcf819174699f9bb1af… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 6 13:24:04 2020 -0500 winmm/tests: Test mmioOpen with long file name. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mmio.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 5501c319c5..e3984fbaf3 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -471,6 +471,58 @@ static void test_mmioOpen(char *fname) mmioClose(hmmio, 0); } +static void test_mmioOpen_create(void) +{ + HMMIO hmmio; + HANDLE handle; + WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; + /* According to docs, filename must be no more than 128 bytes, but it will + * actually allow longer than that. */ + WCHAR filename[] = L"very_long_filename_" + L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + + GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + SetCurrentDirectoryW(temp_dir); + + DeleteFileW(filename); + + /* open with MMIO_DENYNONE */ + hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); + ok(hmmio != NULL, "mmioOpen failed\n"); + + /* MMIO_DENYNONE lets us open it here, too */ + handle = CreateFileW(filename, GENERIC_READ, + FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); + CloseHandle(handle); + + mmioClose(hmmio, 0); + + DeleteFileW(filename); + + /* open with MMIO_EXCLUSIVE */ + hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + ok(hmmio != NULL, "mmioOpen failed\n"); + + /* should fail due to MMIO_EXCLUSIVE */ + handle = CreateFileW(filename, GENERIC_READ, + FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); + if(handle != INVALID_HANDLE_VALUE) + CloseHandle(handle); + + mmioClose(hmmio, 0); + + DeleteFileW(filename); + + SetCurrentDirectoryW(cwd); +} + static void test_mmioSetBuffer(char *fname) { char buf[256]; @@ -1016,6 +1068,7 @@ START_TEST(mmio) test_mmioDescend(fname); test_mmioOpen(NULL); test_mmioOpen(fname); + test_mmioOpen_create(); test_mmioSetBuffer(NULL); test_mmioSetBuffer(fname); test_mmioOpen_fourcc();

1 0

Jacek Caban : include: Avoid _onexit_t redefinition.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: d45e36f5f8253a3e122f874ceb707387f1ef5b33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45e36f5f8253a3e122f874c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 20:26:49 2020 +0200 include: Avoid _onexit_t redefinition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48888 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_startup.h | 3 +++ include/msvcrt/stdlib.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/msvcrt/corecrt_startup.h b/include/msvcrt/corecrt_startup.h index 064f6fca27..58450b94ca 100644 --- a/include/msvcrt/corecrt_startup.h +++ b/include/msvcrt/corecrt_startup.h @@ -32,7 +32,10 @@ typedef struct _onexit_table_t { _PVFV *_end; } _onexit_table_t; +#ifndef _CRT_ONEXIT_T_DEFINED +#define _CRT_ONEXIT_T_DEFINED typedef int (__cdecl *_onexit_t)(void); +#endif struct _exception; typedef int (__cdecl *_UserMathErrorFunctionPointer)(struct _exception *); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index f73f2ae384..2ce4789350 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -136,7 +136,10 @@ errno_t __cdecl _get_errno(int*); errno_t __cdecl _set_doserrno(int); errno_t __cdecl _set_errno(int); +#ifndef _CRT_ONEXIT_T_DEFINED +#define _CRT_ONEXIT_T_DEFINED typedef int (__cdecl *_onexit_t)(void); +#endif int __cdecl _atodbl(_CRT_DOUBLE*,char*);

1 0

Alistair Leslie-Hughes : winmm: Use CreateFileA instead of OpenFile.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 5ee2ef52175c8bf506c4eb9a67bde4cb72a93853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ee2ef52175c8bf506c4eb9a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 6 13:23:49 2020 -0500 winmm: Use CreateFileA instead of OpenFile. OpenFile has a filepath limit of 128. Use CreateFile which doesn't have this limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48832 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27324 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mmio.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 6f14301975..48bbd3ed48 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -48,6 +48,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmio); static WINE_MMIO *MMIOList; +/* From kernel32 */ +static HANDLE create_file_OF( LPCSTR path, INT mode ) +{ + DWORD access, sharing, creation; + + if (mode & OF_CREATE) + { + creation = CREATE_ALWAYS; + access = GENERIC_READ | GENERIC_WRITE; + } + else + { + creation = OPEN_EXISTING; + switch(mode & 0x03) + { + case OF_READ: access = GENERIC_READ; break; + case OF_WRITE: access = GENERIC_WRITE; break; + case OF_READWRITE: access = GENERIC_READ | GENERIC_WRITE; break; + default: access = 0; break; + } + } + + switch(mode & 0x70) + { + case OF_SHARE_EXCLUSIVE: sharing = 0; break; + case OF_SHARE_DENY_WRITE: sharing = FILE_SHARE_READ; break; + case OF_SHARE_DENY_READ: sharing = FILE_SHARE_WRITE; break; + case OF_SHARE_DENY_NONE: + case OF_SHARE_COMPAT: + default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; + } + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); +} + /************************************************************************** * mmioDosIOProc [internal] */ @@ -76,9 +110,14 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, /* if filename NULL, assume open file handle in adwInfo[0] */ if (szFileName) { - OFSTRUCT ofs; - lpmmioinfo->adwInfo[0] = OpenFile(szFileName, &ofs, lpmmioinfo->dwFlags & 0xFFFF); - } + HANDLE file; + + file = create_file_OF( szFileName, lpmmioinfo->dwFlags ); + if (file != INVALID_HANDLE_VALUE) + lpmmioinfo->adwInfo[0] = HandleToLong(file); + else + lpmmioinfo->adwInfo[0] = HFILE_ERROR; + } if (lpmmioinfo->adwInfo[0] == HFILE_ERROR) ret = MMIOERR_FILENOTFOUND; }

1 0

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 April 2020