December 2020 - Wine-commits

Piotr Caban : msvcrt: Use _JUMP_BUFFER from public header.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 835a83e3f9699a83482bc5e74d2e931d87cb1a5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=835a83e3f9699a83482bc5e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:04 2020 +0100 msvcrt: Use _JUMP_BUFFER from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm.c | 3 +- dlls/msvcrt/except_arm64.c | 3 +- dlls/msvcrt/except_i386.c | 15 ++++---- dlls/msvcrt/except_x86_64.c | 3 +- dlls/msvcrt/msvcrt.h | 86 --------------------------------------------- 5 files changed, 14 insertions(+), 96 deletions(-) diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index c76d9b4c330..8e5c552b552 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -21,6 +21,7 @@ #ifdef __arm__ +#include <setjmp.h> #include <stdarg.h> #include <fpieee.h> @@ -114,7 +115,7 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmp, /******************************************************************* * longjmp (MSVCRT.@) */ -void __cdecl MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) +void __cdecl MSVCRT_longjmp(_JUMP_BUFFER *jmp, int retval) { EXCEPTION_RECORD rec; diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 7be0132acd0..242ef8bdb09 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -22,6 +22,7 @@ #ifdef __aarch64__ +#include <setjmp.h> #include <stdarg.h> #include <fpieee.h> @@ -115,7 +116,7 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmp, /******************************************************************* * longjmp (MSVCRT.@) */ -void __cdecl MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) +void __cdecl MSVCRT_longjmp(_JUMP_BUFFER *jmp, int retval) { EXCEPTION_RECORD rec; diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 86d80d7deda..23a027368ba 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -27,6 +27,7 @@ #ifdef __i386__ +#include <setjmp.h> #include <stdarg.h> #include <fpieee.h> @@ -691,7 +692,7 @@ __ASM_GLOBAL_FUNC( __CxxFrameHandler, * * Callback meant to be used as UnwindFunc for setjmp/longjmp. */ -void __stdcall __CxxLongjmpUnwind( const struct MSVCRT___JUMP_BUFFER *buf ) +void __stdcall __CxxLongjmpUnwind( const _JUMP_BUFFER *buf ) { cxx_exception_frame *frame = (cxx_exception_frame *)buf->Registration; const cxx_function_descr *descr = (const cxx_function_descr *)buf->UnwindData[0]; @@ -1019,7 +1020,7 @@ int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void), */ #define MSVCRT_JMP_MAGIC 0x56433230 /* ID value for new jump structure */ -typedef void (__stdcall *MSVCRT_unwind_function)(const struct MSVCRT___JUMP_BUFFER *); +typedef void (__stdcall *MSVCRT_unwind_function)(const _JUMP_BUFFER *); /* define an entrypoint for setjmp/setjmp3 that stores the registers in the jmp buf */ /* and then jumps to the C backend function */ @@ -1039,7 +1040,7 @@ typedef void (__stdcall *MSVCRT_unwind_function)(const struct MSVCRT___JUMP_BUFF * _setjmp (MSVCRT.@) */ DEFINE_SETJMP_ENTRYPOINT(MSVCRT__setjmp) -int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp) +int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(_JUMP_BUFFER *jmp) { jmp->Registration = (unsigned long)NtCurrentTeb()->Tib.ExceptionList; if (jmp->Registration == ~0UL) @@ -1056,7 +1057,7 @@ int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp * _setjmp3 (MSVCRT.@) */ DEFINE_SETJMP_ENTRYPOINT( MSVCRT__setjmp3 ) -int WINAPIV DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, ...) +int WINAPIV DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(_JUMP_BUFFER *jmp, int nb_args, ...) { jmp->Cookie = MSVCRT_JMP_MAGIC; jmp->UnwindFunc = 0; @@ -1087,7 +1088,7 @@ int WINAPIV DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER * /********************************************************************* * longjmp (MSVCRT.@) */ -void CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) +void CDECL MSVCRT_longjmp(_JUMP_BUFFER *jmp, int retval) { unsigned long cur_frame = 0; @@ -1125,7 +1126,7 @@ void CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) /********************************************************************* * _seh_longjmp_unwind (MSVCRT.@) */ -void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp) +void __stdcall _seh_longjmp_unwind(_JUMP_BUFFER *jmp) { msvcrt_local_unwind2( (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, jmp->TryLevel, (void *)jmp->Ebp ); } @@ -1133,7 +1134,7 @@ void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp) /********************************************************************* * _seh_longjmp_unwind4 (MSVCRT.@) */ -void __stdcall _seh_longjmp_unwind4(struct MSVCRT___JUMP_BUFFER *jmp) +void __stdcall _seh_longjmp_unwind4(_JUMP_BUFFER *jmp) { msvcrt_local_unwind4( (ULONG *)&jmp->Cookie, (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, jmp->TryLevel, (void *)jmp->Ebp ); diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index a1a1bc14543..7cbffc0d837 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -20,6 +20,7 @@ #ifdef __x86_64__ +#include <setjmp.h> #include <stdarg.h> #include <fpieee.h> @@ -705,7 +706,7 @@ __ASM_GLOBAL_FUNC( MSVCRT__setjmp, /******************************************************************* * longjmp (MSVCRT.@) */ -void __cdecl MSVCRT_longjmp( struct MSVCRT___JUMP_BUFFER *jmp, int retval ) +void __cdecl MSVCRT_longjmp( _JUMP_BUFFER *jmp, int retval ) { EXCEPTION_RECORD rec; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index b26d736cb18..802482499ec 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,92 +283,6 @@ extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; extern FILE MSVCRT__iob[]; -#ifdef __i386__ -struct MSVCRT___JUMP_BUFFER { - unsigned long Ebp; - unsigned long Ebx; - unsigned long Edi; - unsigned long Esi; - unsigned long Esp; - unsigned long Eip; - unsigned long Registration; - unsigned long TryLevel; - /* Start of new struct members */ - unsigned long Cookie; - unsigned long UnwindFunc; - unsigned long UnwindData[6]; -}; -#elif defined(__x86_64__) -struct MSVCRT__SETJMP_FLOAT128 -{ - unsigned __int64 DECLSPEC_ALIGN(16) Part[2]; -}; -struct MSVCRT___JUMP_BUFFER -{ - unsigned __int64 Frame; - unsigned __int64 Rbx; - unsigned __int64 Rsp; - unsigned __int64 Rbp; - unsigned __int64 Rsi; - unsigned __int64 Rdi; - unsigned __int64 R12; - unsigned __int64 R13; - unsigned __int64 R14; - unsigned __int64 R15; - unsigned __int64 Rip; - unsigned __int64 Spare; - struct MSVCRT__SETJMP_FLOAT128 Xmm6; - struct MSVCRT__SETJMP_FLOAT128 Xmm7; - struct MSVCRT__SETJMP_FLOAT128 Xmm8; - struct MSVCRT__SETJMP_FLOAT128 Xmm9; - struct MSVCRT__SETJMP_FLOAT128 Xmm10; - struct MSVCRT__SETJMP_FLOAT128 Xmm11; - struct MSVCRT__SETJMP_FLOAT128 Xmm12; - struct MSVCRT__SETJMP_FLOAT128 Xmm13; - struct MSVCRT__SETJMP_FLOAT128 Xmm14; - struct MSVCRT__SETJMP_FLOAT128 Xmm15; -}; -#elif defined(__arm__) -struct MSVCRT___JUMP_BUFFER -{ - unsigned long Frame; - unsigned long R4; - unsigned long R5; - unsigned long R6; - unsigned long R7; - unsigned long R8; - unsigned long R9; - unsigned long R10; - unsigned long R11; - unsigned long Sp; - unsigned long Pc; - unsigned long Fpscr; - unsigned long long D[8]; -}; -#elif defined(__aarch64__) -struct MSVCRT___JUMP_BUFFER -{ - unsigned __int64 Frame; - unsigned __int64 Reserved; - unsigned __int64 X19; - unsigned __int64 X20; - unsigned __int64 X21; - unsigned __int64 X22; - unsigned __int64 X23; - unsigned __int64 X24; - unsigned __int64 X25; - unsigned __int64 X26; - unsigned __int64 X27; - unsigned __int64 X28; - unsigned __int64 Fp; - unsigned __int64 Lr; - unsigned __int64 Sp; - unsigned long Fpcr; - unsigned long Fpsr; - double D[8]; -}; -#endif /* __i386__ */ - struct MSVCRT__finddata32_t { unsigned int attrib; __time32_t time_create;

1 0

Piotr Caban : include: Add corecrt_io.h header.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 713364f35c3ba97a8b121a00c7f3287c2c2816bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=713364f35c3ba97a8b121a00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:07 2020 +0100 include: Add corecrt_io.h header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_io.h | 109 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9b6858b78f9..74a1d8e0c89 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -446,6 +446,7 @@ SOURCES = \ msvcrt/complex.h \ msvcrt/conio.h \ msvcrt/corecrt.h \ + msvcrt/corecrt_io.h \ msvcrt/corecrt_startup.h \ msvcrt/corecrt_stdio_config.h \ msvcrt/corecrt_wctype.h \ diff --git a/include/msvcrt/corecrt_io.h b/include/msvcrt/corecrt_io.h new file mode 100644 index 00000000000..d7554c3b1c6 --- /dev/null +++ b/include/msvcrt/corecrt_io.h @@ -0,0 +1,109 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _IO_DEFINED +#define _IO_DEFINED + +#include <corecrt_wio.h> + +#include <pshpack8.h> + +#if defined(_USE_32BIT_TIME_T) +# define _finddata_t _finddata32_t +# define _finddatai64_t _finddata32i64_t +#else +# define _finddata_t _finddata64i32_t +# define _finddatai64_t _finddata64_t +#endif + +struct _finddata32_t { + unsigned attrib; + __time32_t time_create; + __time32_t time_access; + __time32_t time_write; + _fsize_t size; + char name[260]; +}; + +struct _finddata32i64_t { + unsigned attrib; + __time32_t time_create; + __time32_t time_access; + __time32_t time_write; + __int64 DECLSPEC_ALIGN(8) size; + char name[260]; +}; + +struct _finddata64i32_t { + unsigned attrib; + __time64_t time_create; + __time64_t time_access; + __time64_t time_write; + _fsize_t size; + char name[260]; +}; + +struct _finddata64_t { + unsigned attrib; + __time64_t time_create; + __time64_t time_access; + __time64_t time_write; + __int64 DECLSPEC_ALIGN(8) size; + char name[260]; +}; + +#ifdef _UCRT +# ifdef _USE_32BIT_TIME_T +# define _findfirst _findfirst32 +# define _findfirsti64 _findfirst32i64 +# define _findnext _findnext32 +# define _findnexti64 _findnext32i64 +# else +# define _findfirst _findfirst64i32 +# define _findfirsti64 _findfirst64 +# define _findnext _findnext64i32 +# define _findnexti64 _findnext64 +# endif +#else /* _UCRT */ +# ifdef _USE_32BIT_TIME_T +# define _findfirst32 _findfirst +# define _findfirst32i64 _findfirsti64 +# define _findnext32 _findnext +# define _findnext32i64 _findnexti64 +# else +# define _findfirst64i32 _findfirst +# define _findfirst64 _findfirsti64 +# define _findnext64i32 _findnext +# define _findnext64 _findnexti64 +# endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_ACRTIMP int __cdecl _access(const char*,int); +_ACRTIMP int __cdecl _chmod(const char*,int); +_ACRTIMP int __cdecl _creat(const char*,int); +_ACRTIMP intptr_t __cdecl _findfirst32(const char*,struct _finddata32_t*); +_ACRTIMP intptr_t __cdecl _findfirst32i64(const char*, struct _finddata32i64_t*); +_ACRTIMP intptr_t __cdecl _findfirst64(const char*,struct _finddata64_t*); +_ACRTIMP intptr_t __cdecl _findfirst64i32(const char*, struct _finddata64i32_t*); +_ACRTIMP int __cdecl _findnext32(intptr_t,struct _finddata32_t*); +_ACRTIMP int __cdecl _findnext32i64(intptr_t,struct _finddata32i64_t*); +_ACRTIMP int __cdecl _findnext64(intptr_t,struct _finddata64_t*); +_ACRTIMP int __cdecl _findnext64i32(intptr_t,struct _finddata64i32_t*); +_ACRTIMP char* __cdecl _mktemp(char*); +_ACRTIMP int WINAPIV _open(const char*,int,...); +_ACRTIMP int WINAPIV _sopen(const char*,int,int,...); +_ACRTIMP int __cdecl _unlink(const char*); + +#ifdef __cplusplus +} +#endif + +#include <poppack.h> + +#endif /* _IO_DEFINED */

1 0

Piotr Caban : msvcrt: Use _finddata_t definition from public header.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 8a2dc3aa42551da56dfc3fb9f1b3979c032a9738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a2dc3aa42551da56dfc3fb9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:11 2020 +0100 msvcrt: Use _finddata_t definition from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 42 ++++++++++++++++--------- dlls/msvcrt/msvcrt.h | 88 ---------------------------------------------------- 2 files changed, 27 insertions(+), 103 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 689cfe805d1..53b97914cda 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <corecrt_io.h> #include <stdarg.h> #include <stdlib.h> #include <direct.h> @@ -44,8 +45,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #undef _wfindnext64i32 #undef _wfindnext64 +#undef _findfirst +#undef _findfirsti64 +#undef _findnext +#undef _findnexti64 +#undef _findfirst32 +#undef _findnext32 +#undef _findfirst64i32 +#undef _findfirst64 +#undef _findnext64i32 +#undef _findnext64 + /* INTERNAL: Translate WIN32_FIND_DATAA to finddata_t */ -static void msvcrt_fttofd( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata_t* ft) +static void msvcrt_fttofd( const WIN32_FIND_DATAA *fd, struct _finddata_t* ft) { DWORD dw; @@ -65,7 +77,7 @@ static void msvcrt_fttofd( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata_t } /* INTERNAL: Translate WIN32_FIND_DATAA to finddata32_t */ -static void msvcrt_fttofd32( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata32_t* ft) +static void msvcrt_fttofd32( const WIN32_FIND_DATAA *fd, struct _finddata32_t* ft) { DWORD dw; @@ -125,7 +137,7 @@ static void msvcrt_wfttofd32(const WIN32_FIND_DATAW *fd, struct _wfinddata32_t* } /* INTERNAL: Translate WIN32_FIND_DATAA to finddatai64_t */ -static void msvcrt_fttofdi64( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddatai64_t* ft) +static void msvcrt_fttofdi64( const WIN32_FIND_DATAA *fd, struct _finddatai64_t* ft) { DWORD dw; @@ -145,7 +157,7 @@ static void msvcrt_fttofdi64( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddat } /* INTERNAL: Translate WIN32_FIND_DATAA to finddata64_t */ -static void msvcrt_fttofd64( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata64_t* ft) +static void msvcrt_fttofd64( const WIN32_FIND_DATAA *fd, struct _finddata64_t* ft) { DWORD dw; @@ -185,7 +197,7 @@ static void msvcrt_wfttofd64( const WIN32_FIND_DATAW *fd, struct _wfinddata64_t* } /* INTERNAL: Translate WIN32_FIND_DATAA to finddata64i32_t */ -static void msvcrt_fttofd64i32( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata64i32_t* ft) +static void msvcrt_fttofd64i32( const WIN32_FIND_DATAA *fd, struct _finddata64i32_t* ft) { DWORD dw; @@ -357,7 +369,7 @@ int CDECL _findclose(intptr_t hand) * NOTES * See FindFirstFileA. */ -intptr_t CDECL _findfirst(const char * fspec, struct MSVCRT__finddata_t* ft) +intptr_t CDECL _findfirst(const char * fspec, struct _finddata_t* ft) { WIN32_FIND_DATAA find_data; HANDLE hfind; @@ -376,7 +388,7 @@ intptr_t CDECL _findfirst(const char * fspec, struct MSVCRT__finddata_t* ft) /********************************************************************* * _findfirst32 (MSVCRT.@) */ -intptr_t CDECL _findfirst32(const char * fspec, struct MSVCRT__finddata32_t* ft) +intptr_t CDECL _findfirst32(const char * fspec, struct _finddata32_t* ft) { WIN32_FIND_DATAA find_data; HANDLE hfind; @@ -439,7 +451,7 @@ intptr_t CDECL _wfindfirst32(const wchar_t * fspec, struct _wfinddata32_t* ft) * * 64-bit version of _findfirst. */ -intptr_t CDECL _findfirsti64(const char * fspec, struct MSVCRT__finddatai64_t* ft) +intptr_t CDECL _findfirsti64(const char * fspec, struct _finddatai64_t* ft) { WIN32_FIND_DATAA find_data; HANDLE hfind; @@ -460,7 +472,7 @@ intptr_t CDECL _findfirsti64(const char * fspec, struct MSVCRT__finddatai64_t* f * * 64-bit version of _findfirst. */ -intptr_t CDECL _findfirst64(const char * fspec, struct MSVCRT__finddata64_t* ft) +intptr_t CDECL _findfirst64(const char * fspec, struct _finddata64_t* ft) { WIN32_FIND_DATAA find_data; HANDLE hfind; @@ -502,7 +514,7 @@ intptr_t CDECL _wfindfirst64(const wchar_t * fspec, struct _wfinddata64_t* ft) * * 64-bit/32-bit version of _findfirst. */ -intptr_t CDECL _findfirst64i32(const char * fspec, struct MSVCRT__finddata64i32_t* ft) +intptr_t CDECL _findfirst64i32(const char * fspec, struct _finddata64i32_t* ft) { WIN32_FIND_DATAA find_data; HANDLE hfind; @@ -576,7 +588,7 @@ intptr_t CDECL _wfindfirsti64(const wchar_t * fspec, struct _wfinddatai64_t* ft) * NOTES * See FindNextFileA. */ -int CDECL _findnext(intptr_t hand, struct MSVCRT__finddata_t * ft) +int CDECL _findnext(intptr_t hand, struct _finddata_t * ft) { WIN32_FIND_DATAA find_data; @@ -593,7 +605,7 @@ int CDECL _findnext(intptr_t hand, struct MSVCRT__finddata_t * ft) /********************************************************************* * _findnext32 (MSVCRT.@) */ -int CDECL _findnext32(intptr_t hand, struct MSVCRT__finddata32_t * ft) +int CDECL _findnext32(intptr_t hand, struct _finddata32_t * ft) { WIN32_FIND_DATAA find_data; @@ -648,7 +660,7 @@ int CDECL _wfindnext(intptr_t hand, struct _wfinddata_t * ft) * * 64-bit version of _findnext. */ -int CDECL _findnexti64(intptr_t hand, struct MSVCRT__finddatai64_t * ft) +int CDECL _findnexti64(intptr_t hand, struct _finddatai64_t * ft) { WIN32_FIND_DATAA find_data; @@ -667,7 +679,7 @@ int CDECL _findnexti64(intptr_t hand, struct MSVCRT__finddatai64_t * ft) * * 64-bit version of _findnext. */ -int CDECL _findnext64(intptr_t hand, struct MSVCRT__finddata64_t * ft) +int CDECL _findnext64(intptr_t hand, struct _finddata64_t * ft) { WIN32_FIND_DATAA find_data; @@ -705,7 +717,7 @@ int CDECL _wfindnext64(intptr_t hand, struct _wfinddata64_t * ft) * * 64-bit/32-bit version of _findnext. */ -int CDECL _findnext64i32(intptr_t hand, struct MSVCRT__finddata64i32_t * ft) +int CDECL _findnext64i32(intptr_t hand, struct _finddata64i32_t * ft) { WIN32_FIND_DATAA find_data; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 802482499ec..48b2ddfce72 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,78 +283,6 @@ extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; extern FILE MSVCRT__iob[]; -struct MSVCRT__finddata32_t { - unsigned int attrib; - __time32_t time_create; - __time32_t time_access; - __time32_t time_write; - _fsize_t size; - char name[260]; -}; - -struct MSVCRT__finddata32i64_t { - unsigned int attrib; - __time32_t time_create; - __time32_t time_access; - __time32_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - char name[260]; -}; - -struct MSVCRT__finddata64i32_t { - unsigned int attrib; - __time64_t time_create; - __time64_t time_access; - __time64_t time_write; - _fsize_t size; - char name[260]; -}; - -struct MSVCRT__finddata64_t { - unsigned int attrib; - __time64_t time_create; - __time64_t time_access; - __time64_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - char name[260]; -}; - -struct MSVCRT__wfinddata32_t { - unsigned int attrib; - __time32_t time_create; - __time32_t time_access; - __time32_t time_write; - _fsize_t size; - wchar_t name[260]; -}; - -struct MSVCRT__wfinddata32i64_t { - unsigned int attrib; - __time32_t time_create; - __time32_t time_access; - __time32_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - wchar_t name[260]; -}; - -struct MSVCRT__wfinddata64i32_t { - unsigned int attrib; - __time64_t time_create; - __time64_t time_access; - __time64_t time_write; - _fsize_t size; - wchar_t name[260]; -}; - -struct MSVCRT__wfinddata64_t { - unsigned int attrib; - __time64_t time_create; - __time64_t time_access; - __time64_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - wchar_t name[260]; -}; - struct MSVCRT__stat32 { _dev_t st_dev; _ino_t st_ino; @@ -411,22 +339,6 @@ struct MSVCRT__stat64 { __time64_t st_ctime; }; -#ifdef _WIN64 -#define MSVCRT__finddata_t MSVCRT__finddata64i32_t -#define MSVCRT__finddatai64_t MSVCRT__finddata64_t -#define MSVCRT__wfinddata_t MSVCRT__wfinddata64i32_t -#define MSVCRT__wfinddatai64_t MSVCRT__wfinddata64_t -#define MSVCRT__stat MSVCRT__stat64i32 -#define MSVCRT__stati64 MSVCRT__stat64 -#else -#define MSVCRT__finddata_t MSVCRT__finddata32_t -#define MSVCRT__finddatai64_t MSVCRT__finddata32i64_t -#define MSVCRT__wfinddata_t MSVCRT__wfinddata32_t -#define MSVCRT__wfinddatai64_t MSVCRT__wfinddata32i64_t -#define MSVCRT__stat MSVCRT__stat32 -#define MSVCRT__stati64 MSVCRT__stat32i64 -#endif - #define MSVCRT_RAND_MAX 0x7fff #define MSVCRT_NO_CONSOLE_FD (-2)

1 0

Piotr Caban : msvcrt: Use _stat64 definition from public header.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 951968c88a2a705ebe7bbb1ac02cd64f8f899f5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=951968c88a2a705ebe7bbb1a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:15 2020 +0100 msvcrt: Use _stat64 definition from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/msvcrt.h | 56 ---------------------------------------------------- 2 files changed, 2 insertions(+), 58 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1ef72c31057..21ef0e82408 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3003,7 +3003,7 @@ int CDECL _stat64(const char* path, struct _stat64 * buf) return -1; } - memset(buf,0,sizeof(struct MSVCRT__stat64)); + memset(buf,0,sizeof(struct _stat64)); /* FIXME: rdev isn't drive num, despite what the docs say-what is it? Bon 011120: This FIXME seems incorrect @@ -3159,7 +3159,7 @@ int CDECL _wstat64(const wchar_t* path, struct _stat64 * buf) return -1; } - memset(buf,0,sizeof(struct MSVCRT__stat64)); + memset(buf,0,sizeof(struct _stat64)); /* FIXME: rdev isn't drive num, despite what the docs says-what is it? */ if (iswalpha(*path) && path[1] == ':') diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 48b2ddfce72..5416dd9966e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,62 +283,6 @@ extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; extern FILE MSVCRT__iob[]; -struct MSVCRT__stat32 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - __time32_t st_atime; - __time32_t st_mtime; - __time32_t st_ctime; -}; - -struct MSVCRT__stat32i64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - __time32_t st_atime; - __time32_t st_mtime; - __time32_t st_ctime; -}; - -struct MSVCRT__stat64i32 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - __time64_t st_atime; - __time64_t st_mtime; - __time64_t st_ctime; -}; - -struct MSVCRT__stat64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - __time64_t st_atime; - __time64_t st_mtime; - __time64_t st_ctime; -}; - #define MSVCRT_RAND_MAX 0x7fff #define MSVCRT_NO_CONSOLE_FD (-2)

1 0

Piotr Caban : msvcrt: Remove non-needed defines from msvcrt.h.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: f67f1ce79ee98f88aedde3a915bb6d85b9a934ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f67f1ce79ee98f88aedde3a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:17 2020 +0100 msvcrt: Remove non-needed defines from msvcrt.h. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 5 +- dlls/msvcrt/exit.c | 22 +++--- dlls/msvcrt/file.c | 212 +++++++++++++++++++++++++------------------------- dlls/msvcrt/heap.c | 4 +- dlls/msvcrt/mbcs.c | 4 +- dlls/msvcrt/misc.c | 4 +- dlls/msvcrt/msvcrt.h | 72 ----------------- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/process.c | 57 +++++++------- dlls/msvcrt/string.c | 6 +- dlls/msvcrt/time.c | 4 +- dlls/msvcrt/wcs.c | 18 ++--- 12 files changed, 169 insertions(+), 241 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f67f1ce79ee98f88aedd…

1 0

Michael Stefaniuc : ntdll: Print the correct debug string and not a random global variable.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: cdf1b61a47a2fee8befb2ccbcce4e891f60a24f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf1b61a47a2fee8befb2ccb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 4 00:36:29 2020 +0100 ntdll: Print the correct debug string and not a random global variable. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index b99d1655d22..faccd21d4b1 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3533,7 +3533,7 @@ static struct string_index *find_string_index(const struct strsection_header *se break; } else - WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_w(nameW)); + WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_us(&str)); } iter++; } @@ -3794,7 +3794,7 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI break; } else - WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_w(nameW)); + WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_us(&str)); } iter++; }

1 0

Michael Stefaniuc : ntdll: Use wide-char string literals in actctx.c.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 3b4239351a6e6028b8b63246042a68be26bfb7be URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b4239351a6e6028b8b63246… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 4 00:36:30 2020 +0100 ntdll: Use wide-char string literals in actctx.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 532 +++++++++++++++++++--------------------------------- 1 file changed, 194 insertions(+), 338 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b4239351a6e6028b8b6…

1 0

Michael Stefaniuc : ntdll: Use wide-char string literals in version.c.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 4da4e98a7a1478c7871c105a81608ed78383b7d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4da4e98a7a1478c7871c105a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 4 00:36:31 2020 +0100 ntdll: Use wide-char string literals in version.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 177 +++++++++++++++++++-------------------------------- 1 file changed, 64 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4da4e98a7a1478c7871c…

1 0

Michael Stefaniuc : ntdll: Use wide-char string literals.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 636d398c7d60bc29f7eb0ff46dc66849fb5665e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=636d398c7d60bc29f7eb0ff4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 4 00:36:32 2020 +0100 ntdll: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/atom.c | 3 +- dlls/ntdll/directory.c | 6 +-- dlls/ntdll/env.c | 138 +++++++++++++++---------------------------------- dlls/ntdll/loader.c | 107 +++++++++++++------------------------- dlls/ntdll/loadorder.c | 24 +++------ dlls/ntdll/locale.c | 8 ++- dlls/ntdll/path.c | 15 ++---- dlls/ntdll/reg.c | 31 +++-------- dlls/ntdll/relay.c | 32 ++++-------- dlls/ntdll/rtl.c | 6 +-- dlls/ntdll/rtlstr.c | 20 +++---- dlls/ntdll/sec.c | 7 ++- 12 files changed, 123 insertions(+), 274 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=636d398c7d60bc29f7eb…

1 0

Zebediah Figura : mfplat: Zero-initialize the device manager object.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 1452e47f0a91b85afa0057c25dd14cbc65cecdff URL: https://source.winehq.org/git/wine.git/?a=commit;h=1452e47f0a91b85afa0057c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 3 20:55:39 2020 -0600 mfplat: Zero-initialize the device manager object. This fixes a crash for me when reallocating "handles", triggered by the mfplat tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e4cd1c397ad..54bd70a2fff 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8911,14 +8911,12 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man if (!token || !manager) return E_POINTER; - object = heap_alloc(sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IMFDXGIDeviceManager_iface.lpVtbl = &dxgi_device_manager_vtbl; object->refcount = 1; object->token = GetTickCount(); - object->device = NULL; InitializeCriticalSection(&object->cs); InitializeConditionVariable(&object->lock);

1 0