June 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Move retrieving the startup info to the Unix library.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 15c3eaafbb3a376998e9c5eb36cb24816dad5447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15c3eaafbb3a376998e9c5eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 12:10:58 2020 +0200 ntdll: Move retrieving the startup info to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 20 +++++--------------- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/unix/env.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/process.c | 2 ++ dlls/ntdll/unix/thread.c | 5 ++--- dlls/ntdll/unix/unix_private.h | 2 ++ dlls/ntdll/unixlib.h | 3 ++- 9 files changed, 44 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index a68ef5786e..89c0fcac7f 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1247,16 +1247,16 @@ wait: * * Fill the initial RTL_USER_PROCESS_PARAMETERS structure from the server. */ -void init_user_process_params( SIZE_T data_size ) +void init_user_process_params(void) { WCHAR *src, *load_path, *dummy; - SIZE_T info_size, env_size; - NTSTATUS status; + SIZE_T info_size, env_size, data_size = 0; startup_info_t *info = NULL; RTL_USER_PROCESS_PARAMETERS *params = NULL; UNICODE_STRING curdir, dllpath, imagepath, cmdline, title, desktop, shellinfo, runtime; WCHAR **wargv; + unix_funcs->get_startup_info( NULL, &data_size, &info_size ); if (!data_size) { RTL_USER_PROCESS_PARAMETERS initial_params = {0}; @@ -1296,18 +1296,7 @@ void init_user_process_params( SIZE_T data_size ) if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, data_size ))) return; - SERVER_START_REQ( get_startup_info ) - { - wine_server_set_reply( req, info, data_size ); - if (!(status = wine_server_call( req ))) - { - data_size = wine_server_reply_size( reply ); - info_size = reply->info_size; - env_size = data_size - info_size; - } - } - SERVER_END_REQ; - if (status) goto done; + if (unix_funcs->get_startup_info( info, &data_size, &info_size )) goto done; src = (WCHAR *)(info + 1); get_unicode_string( &curdir, &src, info->curdir_len ); @@ -1344,6 +1333,7 @@ void init_user_process_params( SIZE_T data_size ) params->wShowWindow = info->show; /* environment needs to be a separate memory block */ + env_size = data_size - info_size; if ((params->Environment = RtlAllocateHeap( GetProcessHeap(), 0, max( env_size, sizeof(WCHAR) )))) { if (env_size) memcpy( params->Environment, (char *)info + info_size, env_size ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 76df995581..aa7b58b732 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3960,7 +3960,7 @@ void __wine_process_init(void) init_unix_codepage(); init_directories(); - init_user_process_params( info_size ); + init_user_process_params(); params = peb->ProcessParameters; load_global_options(); @@ -4000,7 +4000,7 @@ void __wine_process_init(void) } else { - if (!info_size) status = restart_process( params, status ); + status = restart_process( params, status ); switch (status) { case STATUS_INVALID_IMAGE_WIN_64: diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3691d338d0..d3aa0eb145 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -69,7 +69,7 @@ extern void actctx_init(void) DECLSPEC_HIDDEN; extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN; extern void init_unix_codepage(void) DECLSPEC_HIDDEN; extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN; -extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN; +extern void init_user_process_params(void) DECLSPEC_HIDDEN; extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN; /* server support */ diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 1ffe45ea3b..e260e5c338 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -66,6 +66,7 @@ extern char **__wine_main_environ; extern WCHAR **__wine_main_wargv; USHORT *uctable = NULL, *lctable = NULL; +SIZE_T startup_info_size = 0; int main_argc = 0; char **main_argv = NULL; @@ -903,6 +904,32 @@ static void add_path_var( WCHAR *env, SIZE_T *pos, const char *name, const char } +/************************************************************************* + * get_startup_info + * + * Get the startup information from the server. + */ +NTSTATUS CDECL get_startup_info( startup_info_t *info, SIZE_T *total_size, SIZE_T *info_size ) +{ + NTSTATUS status; + + if (*total_size < startup_info_size) + { + *total_size = startup_info_size; + return STATUS_BUFFER_TOO_SMALL; + } + SERVER_START_REQ( get_startup_info ) + { + wine_server_set_reply( req, info, *total_size ); + status = wine_server_call( req ); + *total_size = wine_server_reply_size( reply ); + *info_size = reply->info_size; + } + SERVER_END_REQ; + return status; +} + + /************************************************************************* * get_dynamic_environment * diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 600a2b0e39..10b483a95a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1497,6 +1497,7 @@ static struct unix_funcs unix_funcs = ntdll_sqrt, ntdll_tan, get_initial_environment, + get_startup_info, get_dynamic_environment, get_initial_console, get_initial_directory, diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 758f47a1e9..578c79bf89 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -591,6 +591,8 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST char **argv; HANDLE handle; + if (startup_info_size) return status; /* started from another Win32 process */ + switch (status) { case STATUS_CONFLICTING_ADDRESSES: diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 129410f8d7..2a8801457d 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -90,7 +90,6 @@ TEB * CDECL init_threading( SIZE_T *size ) { TEB *teb; BOOL suspend; - SIZE_T info_size; teb = virtual_alloc_first_teb(); @@ -99,14 +98,14 @@ TEB * CDECL init_threading( SIZE_T *size ) signal_init_thread( teb ); dbg_init(); server_init_process(); - info_size = server_init_thread( teb->Peb, &suspend ); + startup_info_size = server_init_thread( teb->Peb, &suspend ); virtual_map_user_shared_data(); virtual_create_builtin_view( ntdll_module ); init_cpu_info(); init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); - if (size) *size = info_size; + if (size) *size = startup_info_size; return teb; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 54254632e7..713cd4145e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -96,6 +96,7 @@ int CDECL mmap_is_in_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; int CDECL mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T size, void *arg), void *arg, int top_down ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL get_initial_environment( WCHAR **wargv[], WCHAR *env, SIZE_T *size ) DECLSPEC_HIDDEN; +extern NTSTATUS CDECL get_startup_info( startup_info_t *info, SIZE_T *total_size, SIZE_T *info_size ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL get_dynamic_environment( WCHAR *env, SIZE_T *size ) DECLSPEC_HIDDEN; extern void CDECL get_initial_directory( UNICODE_STRING *dir ) DECLSPEC_HIDDEN; extern void CDECL get_initial_console( HANDLE *handle, HANDLE *std_in, HANDLE *std_out, HANDLE *std_err ) DECLSPEC_HIDDEN; @@ -137,6 +138,7 @@ extern const char **dll_paths DECLSPEC_HIDDEN; extern HMODULE ntdll_module DECLSPEC_HIDDEN; extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN; +extern SIZE_T startup_info_size DECLSPEC_HIDDEN; extern int main_argc DECLSPEC_HIDDEN; extern char **main_argv DECLSPEC_HIDDEN; extern char **main_envp DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index c8bcac3836..71d8ffba1b 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 67 +#define NTDLL_UNIXLIB_VERSION 68 struct unix_funcs { @@ -298,6 +298,7 @@ struct unix_funcs /* environment functions */ NTSTATUS (CDECL *get_initial_environment)( WCHAR **wargv[], WCHAR *env, SIZE_T *size ); + NTSTATUS (CDECL *get_startup_info)( startup_info_t *info, SIZE_T *total_size, SIZE_T *info_size ); NTSTATUS (CDECL *get_dynamic_environment)( WCHAR *env, SIZE_T *size ); void (CDECL *get_initial_console)( HANDLE *handle, HANDLE *std_in, HANDLE *std_out, HANDLE *std_err );

1 0

Alexandre Julliard : ntdll: Reimplement the ctype functions to avoid depending on libc.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: bc8745851e3005fd98c45fe06fc9d4d92c68fa53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc8745851e3005fd98c45fe0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 10:42:28 2020 +0200 ntdll: Reimplement the ctype functions to avoid depending on libc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 78 ++++++++++++++++++++++++++++++++++------------- dlls/ntdll/tests/string.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc8745851e3005fd98c4…

1 0

Alexandre Julliard : include: Fix _memccpy, _memicmp and _memicmp_l prototypes.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 635593a01c2590168324b5a9477f63597535bdeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=635593a01c2590168324b5a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 10:44:56 2020 +0200 include: Fix _memccpy, _memicmp and _memicmp_l prototypes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstring.h | 6 +++--- include/msvcrt/memory.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/corecrt_wstring.h b/include/msvcrt/corecrt_wstring.h index 10ab894328..53537185f4 100644 --- a/include/msvcrt/corecrt_wstring.h +++ b/include/msvcrt/corecrt_wstring.h @@ -19,9 +19,9 @@ _ACRTIMP int __cdecl memcmp(const void*,const void*,size_t); _ACRTIMP void* __cdecl memcpy(void*,const void*,size_t); _ACRTIMP errno_t __cdecl memcpy_s(void*,size_t,const void*,size_t); _ACRTIMP void* __cdecl memset(void*,int,size_t); -_ACRTIMP void* __cdecl _memccpy(void*,const void*,int,unsigned int); -_ACRTIMP int __cdecl _memicmp(const void*,const void*,unsigned int); -_ACRTIMP int __cdecl _memicmp_l(const void*,const void*,unsigned int,_locale_t); +_ACRTIMP void* __cdecl _memccpy(void*,const void*,int,size_t); +_ACRTIMP int __cdecl _memicmp(const void*,const void*,size_t); +_ACRTIMP int __cdecl _memicmp_l(const void*,const void*,size_t,_locale_t); static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); } diff --git a/include/msvcrt/memory.h b/include/msvcrt/memory.h index 21198e8f8b..ebdd2bee93 100644 --- a/include/msvcrt/memory.h +++ b/include/msvcrt/memory.h @@ -22,9 +22,9 @@ int __cdecl memcmp(const void*,const void*,size_t); void* __cdecl memcpy(void*,const void*,size_t); errno_t __cdecl memcpy_s(void*,size_t,const void*,size_t); void* __cdecl memset(void*,int,size_t); -void* __cdecl _memccpy(void*,const void*,int,unsigned int); -int __cdecl _memicmp(const void*,const void*,unsigned int); -int __cdecl _memicmp_l(const void*,const void*,unsigned int,_locale_t); +void* __cdecl _memccpy(void*,const void*,int,size_t); +int __cdecl _memicmp(const void*,const void*,size_t); +int __cdecl _memicmp_l(const void*,const void*,size_t,_locale_t); static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); }

1 0

Michael Müller : ntdll: Return process times in NtQuerySystemInformation(SystemProcessInformation).
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: ed566a87232fddde73481efe2dfcefceca5e49e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed566a87232fddde73481efe… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Jun 28 20:43:19 2020 -0500 ntdll: Return process times in NtQuerySystemInformation(SystemProcessInformation). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 2 ++ dlls/ntdll/unix/thread.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index fd86ab874a..7045bc1550 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2155,6 +2155,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { int i, j; + get_thread_times(unix_pid, -1, &spi->KernelTime, &spi->UserTime); + /* set thread info */ i = j = 0; while (ret == STATUS_SUCCESS) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 3655adf2db..c583a08c05 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -833,7 +833,10 @@ BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LA FILE *f; int i; - sprintf( buf, "/proc/%u/task/%u/stat", unix_pid, unix_tid ); + if (unix_tid == -1) + sprintf( buf, "/proc/%u/stat", unix_pid ); + else + sprintf( buf, "/proc/%u/task/%u/stat", unix_pid, unix_tid ); if (!(f = fopen( buf, "r" ))) { ERR("Failed to open %s: %s\n", buf, strerror(errno));

1 0

Jefferson Carpenter : ntoskrnl.exe: Initialize context.handle and context.irp.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 045455bfe452e180bab85ea2df8d97af07f1322f URL: https://source.winehq.org/git/wine.git/?a=commit;h=045455bfe452e180bab85ea2… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Sat Jun 27 11:11:30 2020 +0000 ntoskrnl.exe: Initialize context.handle and context.irp. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49462 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f952e5d53b..d407cffee6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -854,6 +854,8 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) NTSTATUS status = STATUS_SUCCESS; HANDLE handles[2]; + context.handle = NULL; + context.irp = NULL; context.in_size = 4096; context.in_buff = NULL;

1 0

Alexandre Julliard : ntdll: Avoid a compiler warning when fetching the return address.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 716cf7d342466235d3117db5da788704cbf2853d URL: https://source.winehq.org/git/wine.git/?a=commit;h=716cf7d342466235d3117db5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 10:46:04 2020 +0200 ntdll: Avoid a compiler warning when fetching the return address. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index d91d19f043..ac722bef55 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -360,7 +360,7 @@ NTSTATUS CDECL DECLSPEC_HIDDEN __regs_NtGetContextThread( DWORD edi, DWORD esi, { context->Ebp = ebp; context->Esp = (DWORD)&retaddr; - context->Eip = *(&edi - 1); + context->Eip = (DWORD)NtGetContextThread + 12; context->EFlags = eflags; } return unix_funcs->NtGetContextThread( handle, context );

1 0

Alexandre Julliard : ntdll: Reimplement the string functions to avoid depending on libc.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 067648cd2bdc4776cb69c6554ee9d799e0b201c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=067648cd2bdc4776cb69c655… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 10:43:42 2020 +0200 ntdll: Reimplement the string functions to avoid depending on libc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 20 +++++ dlls/ntdll/string.c | 212 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 206 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=067648cd2bdc4776cb69…

1 0

Zebediah Figura : kernel32: Call PROFILE_DeleteSection directly from WritePrivateProfile* functions.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 17a3c0964dd1734bbfe7bb6d926d33d6023af434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17a3c0964dd1734bbfe7bb6d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 28 13:51:17 2020 -0500 kernel32: Call PROFILE_DeleteSection directly from WritePrivateProfile* functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index dfda24446c..63a400cce6 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -503,11 +503,12 @@ static BOOL PROFILE_DeleteSection( PROFILESECTION **section, LPCWSTR name ) *section = to_del->next; to_del->next = NULL; PROFILE_Free( to_del ); + CurProfile->changed = TRUE; return TRUE; } section = &(*section)->next; } - return FALSE; + return TRUE; } @@ -971,15 +972,7 @@ static INT PROFILE_GetSectionNames( LPWSTR buffer, UINT len ) static BOOL PROFILE_SetString( LPCWSTR section_name, LPCWSTR key_name, LPCWSTR value, BOOL create_always ) { - if (!key_name) /* Delete a whole section */ - { - TRACE("(%s)\n", debugstr_w(section_name)); - CurProfile->changed |= PROFILE_DeleteSection( &CurProfile->section, - section_name ); - return TRUE; /* Even if PROFILE_DeleteSection() has failed, - this is not an error on application's level.*/ - } - else if (!value) /* Delete a key */ + if (!value) /* Delete a key */ { TRACE("(%s,%s)\n", debugstr_w(section_name), debugstr_w(key_name) ); CurProfile->changed |= PROFILE_DeleteKey( &CurProfile->section, @@ -1335,12 +1328,13 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, } else if (PROFILE_Open( filename, TRUE )) { - if (!section) { + if (!section) SetLastError(ERROR_FILE_NOT_FOUND); - } else { + else if (!entry) + ret = PROFILE_DeleteSection( &CurProfile->section, section ); + else ret = PROFILE_SetString( section, entry, string, FALSE); - if (ret) ret = PROFILE_FlushFile(); - } + if (ret) ret = PROFILE_FlushFile(); } RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1393,8 +1387,9 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, } } else if (PROFILE_Open( filename, TRUE )) { - if (!string) {/* delete the named section*/ - ret = PROFILE_SetString(section,NULL,NULL, FALSE); + if (!string) + { + ret = PROFILE_DeleteSection( &CurProfile->section, section ); } else { PROFILE_DeleteAllKeys(section); ret = TRUE;

1 0

Zebediah Figura : kernel32: Open the INI file in PROFILE_DeleteSection().
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 50553b5db14b6408612eeec18d2125436e3f966f URL: https://source.winehq.org/git/wine.git/?a=commit;h=50553b5db14b6408612eeec1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 28 13:51:18 2020 -0500 kernel32: Open the INI file in PROFILE_DeleteSection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 113 +++++++++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 50 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 63a400cce6..2cf0819023 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -488,30 +488,6 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) } -/*********************************************************************** - * PROFILE_DeleteSection - * - * Delete a section from a profile tree. - */ -static BOOL PROFILE_DeleteSection( PROFILESECTION **section, LPCWSTR name ) -{ - while (*section) - { - if (!strcmpiW( (*section)->name, name )) - { - PROFILESECTION *to_del = *section; - *section = to_del->next; - to_del->next = NULL; - PROFILE_Free( to_del ); - CurProfile->changed = TRUE; - return TRUE; - } - section = &(*section)->next; - } - return TRUE; -} - - /*********************************************************************** * PROFILE_DeleteKey * @@ -923,6 +899,37 @@ static INT PROFILE_GetSection( const WCHAR *filename, LPCWSTR section_name, return 0; } +static BOOL PROFILE_DeleteSection( const WCHAR *filename, const WCHAR *name ) +{ + PROFILESECTION **section; + + EnterCriticalSection( &PROFILE_CritSect ); + + if (!PROFILE_Open( filename, TRUE )) + { + LeaveCriticalSection( &PROFILE_CritSect ); + return FALSE; + } + + for (section = &CurProfile->section; *section; section = &(*section)->next) + { + if (!strcmpiW( (*section)->name, name )) + { + PROFILESECTION *to_del = *section; + *section = to_del->next; + to_del->next = NULL; + PROFILE_Free( to_del ); + CurProfile->changed = TRUE; + PROFILE_FlushFile(); + break; + } + } + + LeaveCriticalSection( &PROFILE_CritSect ); + return TRUE; +} + + /* See GetPrivateProfileSectionNamesA for documentation */ static INT PROFILE_GetSectionNames( LPWSTR buffer, UINT len ) { @@ -1317,27 +1324,30 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, { BOOL ret = FALSE; - RtlEnterCriticalSection( &PROFILE_CritSect ); - if (!section && !entry && !string) /* documented "file flush" case */ { + EnterCriticalSection( &PROFILE_CritSect ); if (!filename || PROFILE_Open( filename, TRUE )) { - if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ + if (CurProfile) PROFILE_ReleaseFile(); } + LeaveCriticalSection( &PROFILE_CritSect ); + return FALSE; } - else if (PROFILE_Open( filename, TRUE )) + if (!entry) return PROFILE_DeleteSection( filename, section ); + + EnterCriticalSection( &PROFILE_CritSect ); + + if (PROFILE_Open( filename, TRUE )) { if (!section) SetLastError(ERROR_FILE_NOT_FOUND); - else if (!entry) - ret = PROFILE_DeleteSection( &CurProfile->section, section ); else ret = PROFILE_SetString( section, entry, string, FALSE); if (ret) ret = PROFILE_FlushFile(); } - RtlLeaveCriticalSection( &PROFILE_CritSect ); + LeaveCriticalSection( &PROFILE_CritSect ); return ret; } @@ -1377,37 +1387,40 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, BOOL ret = FALSE; LPWSTR p; - RtlEnterCriticalSection( &PROFILE_CritSect ); - if (!section && !string) { + EnterCriticalSection( &PROFILE_CritSect ); if (!filename || PROFILE_Open( filename, TRUE )) { - if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ + if (CurProfile) PROFILE_ReleaseFile(); } + LeaveCriticalSection( &PROFILE_CritSect ); + return FALSE; } - else if (PROFILE_Open( filename, TRUE )) { - if (!string) + if (!string) return PROFILE_DeleteSection( filename, section ); + + EnterCriticalSection( &PROFILE_CritSect ); + + if (PROFILE_Open( filename, TRUE )) + { + PROFILE_DeleteAllKeys(section); + ret = TRUE; + while (*string && ret) { - ret = PROFILE_DeleteSection( &CurProfile->section, section ); - } else { - PROFILE_DeleteAllKeys(section); - ret = TRUE; - while(*string && ret) { - LPWSTR buf = HeapAlloc( GetProcessHeap(), 0, (strlenW(string)+1) * sizeof(WCHAR) ); - strcpyW( buf, string ); - if((p = strchrW( buf, '='))) { - *p='\0'; - ret = PROFILE_SetString( section, buf, p+1, TRUE); - } - HeapFree( GetProcessHeap(), 0, buf ); - string += strlenW(string)+1; + WCHAR *buf = HeapAlloc( GetProcessHeap(), 0, (strlenW( string ) + 1) * sizeof(WCHAR) ); + strcpyW( buf, string ); + if ((p = strchrW( buf, '='))) + { + *p = '\0'; + ret = PROFILE_SetString( section, buf, p+1, TRUE ); } + HeapFree( GetProcessHeap(), 0, buf ); + string += strlenW( string ) + 1; } if (ret) ret = PROFILE_FlushFile(); } - RtlLeaveCriticalSection( &PROFILE_CritSect ); + LeaveCriticalSection( &PROFILE_CritSect ); return ret; }

1 0

Zebediah Figura : d3dcompiler: Add the node to the instruction list in new_expr().
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 7260f978f380355490d535daaa52ee09d453b897 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7260f978f380355490d535da… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 22 17:47:19 2020 -0500 d3dcompiler: Add the node to the instruction list in new_expr(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 27 ++++++++--------------- dlls/d3dcompiler_43/hlsl.y | 36 +++++++++++++++++++++++++++---- dlls/d3dcompiler_43/utils.c | 5 +++-- 3 files changed, 44 insertions(+), 24 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 97b84c4494..50457b2e64 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1059,9 +1059,18 @@ static inline void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type t struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; +struct hlsl_ir_expr *add_expr(struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[3], + struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_ir_node *add_implicit_conversion(struct list *instrs, struct hlsl_ir_node *node, struct hlsl_type *type, struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, + struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; +struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, + struct source_location loc) DECLSPEC_HIDDEN; + BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; @@ -1075,10 +1084,6 @@ BOOL find_function(const char *name) DECLSPEC_HIDDEN; unsigned int components_count_type(struct hlsl_type *type) DECLSPEC_HIDDEN; BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; BOOL compatible_data_types(struct hlsl_type *s1, struct hlsl_type *s2) DECLSPEC_HIDDEN; -struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **operands, - struct source_location *loc) DECLSPEC_HIDDEN; -struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, - struct source_location *loc) DECLSPEC_HIDDEN; void push_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; BOOL pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; void init_functions_tree(struct wine_rb_tree *funcs) DECLSPEC_HIDDEN; @@ -1098,20 +1103,6 @@ void free_instr(struct hlsl_ir_node *node) DECLSPEC_HIDDEN; void free_instr_list(struct list *list) DECLSPEC_HIDDEN; void free_function_rb(struct wine_rb_entry *entry, void *context) DECLSPEC_HIDDEN; -static inline struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, - struct hlsl_ir_node *op1, struct source_location loc) -{ - struct hlsl_ir_node *operands[3] = {op1}; - return &new_expr(op, operands, &loc)->node; -} - -static inline struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, - struct hlsl_ir_node *op1, struct hlsl_ir_node *op2, struct source_location loc) -{ - struct hlsl_ir_node *operands[3] = {op1, op2}; - return &new_expr(op, operands, &loc)->node; -} - #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 43ffa43a02..4e43a80275 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -608,6 +608,34 @@ static struct hlsl_ir_constant *new_uint_constant(unsigned int n, const struct s return c; } +struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, struct source_location loc) +{ + struct hlsl_ir_expr *expr; + + if (!(expr = d3dcompiler_alloc(sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, arg->data_type, loc); + expr->op = op; + expr->operands[0] = arg; + return &expr->node; +} + +struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, + struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2) +{ + struct hlsl_ir_expr *expr; + + assert(compare_hlsl_types(arg1->data_type, arg2->data_type)); + + if (!(expr = d3dcompiler_alloc(sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, arg1->data_type, arg1->loc); + expr->op = op; + expr->operands[0] = arg1; + expr->operands[1] = arg2; + return &expr->node; +} + static struct hlsl_ir_load *new_var_load(struct hlsl_ir_var *var, const struct source_location loc) { struct hlsl_ir_load *load = d3dcompiler_alloc(sizeof(*load)); @@ -636,7 +664,7 @@ static struct hlsl_ir_load *add_load(struct list *instrs, struct hlsl_ir_node *v var = src->var; if (src->offset) { - if (!(add = new_binary_expr(HLSL_IR_BINOP_ADD, src->offset, offset, loc))) + if (!(add = new_binary_expr(HLSL_IR_BINOP_ADD, src->offset, offset))) return NULL; list_add_tail(instrs, &add->entry); offset = add; @@ -712,7 +740,7 @@ static struct hlsl_ir_load *add_array_load(struct list *instrs, struct hlsl_ir_n if (!(c = new_uint_constant(data_type->reg_size * 4, loc))) return NULL; list_add_tail(instrs, &c->node.entry); - if (!(mul = new_binary_expr(HLSL_IR_BINOP_MUL, index, &c->node, loc))) + if (!(mul = new_binary_expr(HLSL_IR_BINOP_MUL, index, &c->node))) return NULL; list_add_tail(instrs, &mul->entry); index = mul; @@ -1196,10 +1224,10 @@ static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) static struct list *add_binary_expr(struct list *list1, struct list *list2, enum hlsl_ir_expr_op op, struct source_location loc) { - struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2); + struct hlsl_ir_node *args[3] = {node_from_list(list1), node_from_list(list2)}; list_move_tail(list1, list2); d3dcompiler_free(list2); - list_add_tail(list1, &new_binary_expr(op, arg1, arg2, loc)->entry); + add_expr(list1, op, args, &loc); return list1; } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 3f063e1a0a..aadad17691 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1328,7 +1328,7 @@ struct hlsl_ir_node *add_implicit_conversion(struct list *instrs, struct hlsl_ir return &cast->node; } -struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **operands, +struct hlsl_ir_expr *add_expr(struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[3], struct source_location *loc) { struct hlsl_ir_expr *expr; @@ -1372,6 +1372,7 @@ struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **ope expr->operands[0] = operands[0]; expr->operands[1] = operands[1]; expr->operands[2] = operands[2]; + list_add_tail(instrs, &expr->node.entry); return expr; } @@ -1519,7 +1520,7 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh struct hlsl_ir_node *expr; TRACE("Adding an expression for the compound assignment.\n"); - expr = new_binary_expr(op, lhs, rhs, lhs->loc); + expr = new_binary_expr(op, lhs, rhs); list_add_after(&rhs->entry, &expr->entry); rhs = expr; }

1 0