wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Rémi Bernon : dbghelp: Read process memory using target addresses, not debugger.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 8ec843e77b3b921a9b9be1397af6ba77b3ba797d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ec843e77b3b921a9b9be139… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 4 17:34:08 2020 +0100 dbghelp: Read process memory using target addresses, not debugger. This fixes "wine winedbg --gdb winecfg" not working anymore. There was a regression since f40195cd9206, but the environment read was broken before. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index e38687412eb..00d7b61fbd8 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -311,8 +311,8 @@ static BOOL check_live_target(struct process* pcs) { PEB peb; if (!ReadProcessMemory(pcs->handle, pbi.PebBaseAddress, &peb, sizeof(peb), NULL)) return FALSE; - if (!ReadProcessMemory(pcs->handle, &peb.CloudFileFlags, &base, sizeof(base), NULL)) return FALSE; - ReadProcessMemory(pcs->handle, &peb.ProcessParameters->Environment, &env, sizeof(env), NULL); + if (!ReadProcessMemory(pcs->handle, (char *)pbi.PebBaseAddress + FIELD_OFFSET(PEB, CloudFileFlags), &base, sizeof(base), NULL)) return FALSE; + ReadProcessMemory(pcs->handle, (char *)peb.ProcessParameters + FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, Environment), &env, sizeof(env), NULL); } /* read debuggee environment block */

1 0

Piotr Caban : ntdll: Fix memchr implementation.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 7d94c4f0e4e96c97c0beed7aead626026caa2d03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d94c4f0e4e96c97c0beed7a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 17:41:50 2020 +0100 ntdll: Fix memchr implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50228 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 2 +- dlls/ntdll/string.c | 2 +- dlls/ntdll/tests/string.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 0c4c657ba99..348c36f3ed5 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2621,7 +2621,7 @@ void* __cdecl memchr(const void *ptr, int c, size_t n) { const unsigned char *p = ptr; - for (p = ptr; n; n--, p++) if (*p == c) return (void *)(ULONG_PTR)p; + for (p = ptr; n; n--, p++) if (*p == (unsigned char)c) return (void *)(ULONG_PTR)p; return NULL; } diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 588b5dd5de7..f1cea6caa83 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -72,7 +72,7 @@ void * __cdecl memchr( const void *ptr, int c, size_t n ) { const unsigned char *p = ptr; - for (p = ptr; n; n--, p++) if (*p == c) return (void *)(ULONG_PTR)p; + for (p = ptr; n; n--, p++) if (*p == (unsigned char)c) return (void *)(ULONG_PTR)p; return NULL; } diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index b6a40f6709c..6939dd3c15e 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -65,6 +65,7 @@ static int (__cdecl *p_wcsnicmp)(LPCWSTR,LPCWSTR,int); static LPWSTR (__cdecl *pwcschr)(LPCWSTR, WCHAR); static LPWSTR (__cdecl *pwcsrchr)(LPCWSTR, WCHAR); +static void* (__cdecl *pmemchr)(const void*, int, size_t); static void (__cdecl *pqsort)(void *,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static void* (__cdecl *pbsearch)(void *,void*,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); @@ -134,6 +135,7 @@ static void InitFunctionPtrs(void) X(_wcsnicmp); X(wcschr); X(wcsrchr); + X(memchr); X(qsort); X(bsearch); X(_snprintf); @@ -2035,6 +2037,24 @@ static void test_ctype(void) } } +static void test_memchr(void) +{ + const char s[] = "ab"; + char *r; + + r = pmemchr(s, 'z', 2); + ok(!r, "memchr returned %p, expected NULL\n", r); + + r = pmemchr(s, 'a', 2); + ok(r == s, "memchr returned %p, expected %p\n", r, s); + + r = pmemchr(s, 0x100 + 'a', 2); + ok(r == s, "memchr returned %p, expected %p\n", r, s); + + r = pmemchr(s, -0x100 + 'a', 2); + ok(r == s, "memchr returned %p, expected %p\n", r, s); +} + START_TEST(string) { InitFunctionPtrs(); @@ -2066,4 +2086,5 @@ START_TEST(string) test_sscanf(); test_wctype(); test_ctype(); + test_memchr(); }

1 0

Alexandre Julliard : msvcrt: Fix _wstat() spec entry.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: d44f54340570c699a17dbbee55021c6ba0ea1bbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d44f54340570c699a17dbbee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 16:45:45 2020 +0100 msvcrt: Fix _wstat() spec entry. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 26f02721ede..2851c42d7c8 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -665,7 +665,7 @@ @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) -@ cdecl _wstat(str ptr) +@ cdecl _wstat(wstr ptr) @ cdecl _wstat64(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstrdate(ptr) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 579fda550f4..6a60a7d5827 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -661,7 +661,7 @@ @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) -@ cdecl _wstat(str ptr) +@ cdecl _wstat(wstr ptr) @ cdecl _wstat64(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstrdate(ptr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e2b61403321..6f256a2d58e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1218,7 +1218,7 @@ @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) -@ cdecl _wstat(str ptr) +@ cdecl _wstat(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstat64(wstr ptr) @ cdecl _wstrdate(ptr) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index c3d7a338b1b..503a13180ba 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -620,7 +620,7 @@ @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) -@ cdecl _wstat(str ptr) +@ cdecl _wstat(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstrdate(ptr) @ cdecl _wstrtime(ptr)

1 0

Piotr Caban : msvcrt: Remove separate long double math funtions.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: 93cdf1ada01248185c323332a90b3747e08d46cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=93cdf1ada01248185c323332… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:29 2020 +0100 msvcrt: Remove separate long double math funtions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 50 ++++++------ dlls/msvcrt/math.c | 195 -------------------------------------------- dlls/ucrtbase/ucrtbase.spec | 92 ++++++++++----------- 3 files changed, 71 insertions(+), 266 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93cdf1ada01248185c32…

1 0

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

04 Dec '20

Module: wine Branch: master Commit: a7b9948f396a904b43851105f14e86455ebae703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b9948f396a904b43851105… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:25 2020 +0100 msvcrt: Use _configthreadlocale arguments definition from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 3 --- include/msvcrt/locale.h | 12 ++++++++++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 39ab6dadc84..ba98d31d719 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -2052,12 +2052,12 @@ int CDECL _configthreadlocale(int type) thread_data_t *data = msvcrt_get_thread_data(); int ret; - ret = (data->locale_flags & LOCALE_THREAD ? MSVCRT__ENABLE_PER_THREAD_LOCALE : - MSVCRT__DISABLE_PER_THREAD_LOCALE); + ret = (data->locale_flags & LOCALE_THREAD ? _ENABLE_PER_THREAD_LOCALE : + _DISABLE_PER_THREAD_LOCALE); - if(type == MSVCRT__ENABLE_PER_THREAD_LOCALE) + if(type == _ENABLE_PER_THREAD_LOCALE) data->locale_flags |= LOCALE_THREAD; - else if(type == MSVCRT__DISABLE_PER_THREAD_LOCALE) + else if(type == _DISABLE_PER_THREAD_LOCALE) data->locale_flags &= ~LOCALE_THREAD; else if(type) ret = -1; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 28feb7d90df..d86056f4c05 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -296,9 +296,6 @@ extern FILE MSVCRT__iob[]; #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF) -#define MSVCRT__ENABLE_PER_THREAD_LOCALE 1 -#define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 - _locale_t CDECL get_current_locale_noalloc(_locale_t locale) DECLSPEC_HIDDEN; void CDECL free_locale_noalloc(_locale_t locale) DECLSPEC_HIDDEN; pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN; diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h index ee0d99b8e7e..d2963813475 100644 --- a/include/msvcrt/locale.h +++ b/include/msvcrt/locale.h @@ -68,6 +68,18 @@ struct lconv struct tm; +#ifndef _CONFIG_LOCALE_SWT +#define _CONFIG_LOCALE_SWT + +#define _ENABLE_PER_THREAD_LOCALE 0x1 +#define _DISABLE_PER_THREAD_LOCALE 0x2 +#define _ENABLE_PER_THREAD_LOCALE_GLOBAL 0x10 +#define _DISABLE_PER_THREAD_LOCALE_GLOBAL 0x20 +#define _ENABLE_PER_THREAD_LOCALE_NEW 0x100 +#define _DISABLE_PER_THREAD_LOCALE_NEW 0x200 + +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

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

04 Dec '20

Module: wine Branch: master Commit: 79e950bb7989809f62573e3209f2cb1bc0852d6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=79e950bb7989809f62573e32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:22 2020 +0100 msvcrt: Remove non-needed function declarations from msvcrt.h. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 1 + dlls/msvcrt/exit.c | 1 + dlls/msvcrt/mbcs.c | 3 ++- dlls/msvcrt/msvcrt.h | 48 ----------------------------------------------- dlls/msvcrt/scanf.c | 1 + include/msvcrt/mbctype.h | 1 + include/msvcrt/mbstring.h | 1 + 7 files changed, 7 insertions(+), 49 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 53b97914cda..91aaaf5ff18 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -22,6 +22,7 @@ */ #include <corecrt_io.h> +#include <mbctype.h> #include <stdarg.h> #include <stdlib.h> #include <direct.h> diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 492bcbf7b21..323d205b1bd 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <conio.h> #include <process.h> #include <signal.h> #include <stdio.h> diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cef67e71d47..03af50d8b01 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <limits.h> #include <mbctype.h> +#include <mbstring.h> #include "msvcrt.h" #include "mtdll.h" @@ -577,7 +578,7 @@ unsigned char* CDECL _mbsdec(const unsigned char* start, const unsigned char* cu /********************************************************************* * _mbclen(MSVCRT.@) */ -unsigned int CDECL _mbclen(const unsigned char* str) +size_t CDECL _mbclen(const unsigned char* str) { return _ismbblead(*str) ? 2 : 1; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index cdb35456ecb..28feb7d90df 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -296,27 +296,6 @@ extern FILE MSVCRT__iob[]; #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF) -int __cdecl MSVCRT_iswdigit(wint_t); - -int __cdecl MSVCRT__fgetc_nolock(FILE*); -int __cdecl MSVCRT__fputc_nolock(int,FILE*); -int __cdecl MSVCRT__ungetc_nolock(int,FILE*); -wint_t __cdecl MSVCRT__fgetwc_nolock(FILE*); -wint_t __cdecl MSVCRT__fputwc_nolock(wint_t,FILE*); -wint_t __cdecl MSVCRT__ungetwc_nolock(wint_t, FILE*); -int __cdecl MSVCRT__fseeki64_nolock(FILE*,__int64,int); -__int64 __cdecl MSVCRT__ftelli64(FILE* file); -__int64 __cdecl MSVCRT__ftelli64_nolock(FILE*); -size_t __cdecl MSVCRT__fread_nolock(void*,size_t,size_t,FILE*); -size_t __cdecl MSVCRT__fread_nolock_s(void*,size_t,size_t,size_t,FILE*); -size_t __cdecl MSVCRT__fwrite_nolock(const void*,size_t,size_t,FILE*); -int __cdecl MSVCRT__fclose_nolock(FILE*); -int __cdecl MSVCRT__fflush_nolock(FILE*); -FILE* __cdecl MSVCRT__iob_func(void); -__time32_t __cdecl MSVCRT__time32(__time32_t*); -__time64_t __cdecl MSVCRT__time64(__time64_t*); -FILE* __cdecl MSVCRT__fdopen(int, const char *); - #define MSVCRT__ENABLE_PER_THREAD_LOCALE 1 #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 @@ -329,33 +308,6 @@ void free_locinfo(pthreadlocinfo) DECLSPEC_HIDDEN; void free_mbcinfo(pthreadmbcinfo) DECLSPEC_HIDDEN; int __cdecl __crtLCMapStringA(LCID, DWORD, const char*, int, char*, int, unsigned int, int) DECLSPEC_HIDDEN; -int __cdecl _getch(void); -int __cdecl _ismbblead(unsigned int); -int __cdecl _ismbblead_l(unsigned int, _locale_t); -int __cdecl _ismbclegal(unsigned int c); -int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); -void __cdecl MSVCRT__searchenv(const char*,const char*,char*); -char* __cdecl _strset(char*,int); -int __cdecl _ungetch(int); -int __cdecl _cputs(const char*); -int WINAPIV _cprintf(const char*,...); -int WINAPIV _cwprintf(const wchar_t*,...); -char*** __cdecl MSVCRT___p__environ(void); -int* __cdecl __p___mb_cur_max(void); -wchar_t*** __cdecl MSVCRT___p__wenviron(void); -char* __cdecl MSVCRT__strdate(char* date); -char* __cdecl MSVCRT__strtime(char* date); -int __cdecl _setmbcp(int); -void __cdecl MSVCRT__wsearchenv(const wchar_t*, const wchar_t*, wchar_t*); -int __cdecl MSVCRT__towupper_l(wint_t,_locale_t); -int __cdecl MSVCRT__towlower_l(wint_t,_locale_t); -int __cdecl MSVCRT_strcmp(const char*, const char*); -char* __cdecl MSVCRT__itoa(int, char*, int); - -float __cdecl MSVCRT_floorf( float x ); -double __cdecl MSVCRT_sqrt( double x ); -float __cdecl MSVCRT_sqrtf( float x ); - enum fpmod { FP_ROUND_ZERO, /* only used when dropped part contains only zeros */ FP_ROUND_DOWN, diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 8ada1cccfa5..988cbd0920d 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -23,6 +23,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <conio.h> #include <stdarg.h> #include <limits.h> #include <math.h> diff --git a/include/msvcrt/mbctype.h b/include/msvcrt/mbctype.h index d821041ea16..a7a85135133 100644 --- a/include/msvcrt/mbctype.h +++ b/include/msvcrt/mbctype.h @@ -68,6 +68,7 @@ _ACRTIMP int __cdecl _setmbcp(int); #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED _ACRTIMP int __cdecl _ismbblead(unsigned int); +_ACRTIMP int __cdecl _ismbblead_l(unsigned int,_locale_t); _ACRTIMP int __cdecl _ismbbtrail(unsigned int); _ACRTIMP int __cdecl _ismbslead(const unsigned char*,const unsigned char*); _ACRTIMP int __cdecl _ismbstrail(const unsigned char*,const unsigned char*); diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index fa35fcd1e42..1de3307326f 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -113,6 +113,7 @@ _ACRTIMP errno_t __cdecl _mbsupr_s(unsigned char*, size_t); #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED _ACRTIMP int __cdecl _ismbblead(unsigned int); +_ACRTIMP int __cdecl _ismbblead_l(unsigned int,_locale_t); _ACRTIMP int __cdecl _ismbbtrail(unsigned int); _ACRTIMP int __cdecl _ismbslead(const unsigned char*,const unsigned char*); _ACRTIMP int __cdecl _ismbstrail(const unsigned char*,const unsigned char*);

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

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

← Newer
1
...
20
21
22
23
24
25
26
...
42
Older →

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