wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Robert Wilhelm : vbscript: Allow public and private declarations in global scope.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 53cd1a27ad6b5a59c00525c1324e3c2405f58c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53cd1a27ad6b5a59c00525c1… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Sep 28 20:09:14 2020 +0200 vbscript: Allow public and private declarations in global scope. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46588 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 7 +++++++ dlls/vbscript/tests/lang.vbs | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 924d0b973b..cf94bdce46 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -131,6 +131,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token <dbl> tDouble %type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt BodyStatements IfStatement Else_opt +%type <statement> GlobalDimDeclaration %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression ExpressionNl_opt %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression SignExpression @@ -161,9 +162,15 @@ OptionExplicit_opt SourceElements : /* empty */ + | SourceElements GlobalDimDeclaration StSep + { source_add_statement(ctx, $2); } | SourceElements StatementNl { source_add_statement(ctx, $2); } | SourceElements ClassDeclaration { source_add_class(ctx, $2); } +GlobalDimDeclaration + : tPRIVATE DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } + | tPUBLIC DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } + ExpressionNl_opt : /* empty */ { $$ = NULL; } | Expression tNL { $$ = $1; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9f254f502b..dc16c50fae 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -69,6 +69,10 @@ Call ok(x = "xx", "x = " & x & " expected ""xx""") Dim public1 : public1 = 42 Call ok(public1 = 42, "public1=" & public1 & " expected & " & 42) +Private priv1 : priv1 = 43 +Call ok(priv1 = 43, "priv1=" & priv1 & " expected & " & 43) +Public pub1 : pub1 = 44 +Call ok(pub1 = 44, "pub1=" & pub1 & " expected & " & 44) Call ok(true <> false, "true <> false is false") Call ok(not (true <> true), "true <> true is true")

1 0

Robert Wilhelm : vbscript: Global_Split free delimiter only if it was allocated.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 723f5f1cc0dfdace65e3d70e8cae9a84f059fbdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=723f5f1cc0dfdace65e3d70e… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Sep 28 15:44:10 2020 +0200 vbscript: Global_Split free delimiter only if it was allocated. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 8978077721..4b1c23b838 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2458,7 +2458,7 @@ error: heap_free(indices); if(V_VT(args) != VT_BSTR) SysFreeString(string); - if(V_VT(args+1) != VT_BSTR) + if(args_cnt > 1 && V_VT(args+1) != VT_BSTR) SysFreeString(delimiter); return hres; }

1 0

Esme Povirk : mscoree: Update Wine Mono to 5.1.1.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 6078375a298f4879ada0a91e84451ca24f851800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6078375a298f4879ada0a91e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Sep 28 11:58:18 2020 -0500 mscoree: Update Wine Mono to 5.1.1. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index dcade07c44..346411867c 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "5.1.0" +#define MONO_VERSION "5.1.1" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "ae55439c7cd61d1a17f0c687967fad8ad12d9e2263972ffd5e9dde2685fd8ddd" +#define MONO_SHA "74541265b9385842bc22bba2bb4b90bf1d3fd8b4788b6676140700bebacb9227" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 096b20875b..c9edc2d68d 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "5.1.0" +#define WINE_MONO_VERSION "5.1.1" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Alexandre Julliard : configure: Don't disable ntdll or kernel32 for Windows builds.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 725bb795f8f8793b6649f01eb28e3238b9099025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=725bb795f8f8793b6649f01e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 16:34:23 2020 +0200 configure: Don't disable ntdll or kernel32 for Windows builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 -- configure.ac | 2 -- 2 files changed, 4 deletions(-) diff --git a/configure b/configure index a70d60da82..296e476779 100755 --- a/configure +++ b/configure @@ -8282,8 +8282,6 @@ if test "x$ac_cv_cflags__Wl___disable_stdcall_fixup" = xyes; then : fi ;; esac enable_iphlpapi=${enable_iphlpapi:-no} - enable_kernel32=${enable_kernel32:-no} - enable_ntdll=${enable_ntdll:-no} enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} diff --git a/configure.ac b/configure.ac index 722e5653bd..1072f16f09 100644 --- a/configure.ac +++ b/configure.ac @@ -723,8 +723,6 @@ case $host_os in esac dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} - enable_kernel32=${enable_kernel32:-no} - enable_ntdll=${enable_ntdll:-no} enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no}

1 0

Alexandre Julliard : kernel32: Build with msvcrt.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 0c631ebb2354334eaf309bc0765d3283654cf902 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c631ebb2354334eaf309bc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 16:34:11 2020 +0200 kernel32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 4 +- dlls/kernel32/atom.c | 9 +-- dlls/kernel32/comm.c | 39 ++++++------ dlls/kernel32/computername.c | 4 -- dlls/kernel32/console.c | 5 +- dlls/kernel32/debugger.c | 3 +- dlls/kernel32/editline.c | 4 -- dlls/kernel32/file.c | 9 +-- dlls/kernel32/heap.c | 3 - dlls/kernel32/kernel_main.c | 4 -- dlls/kernel32/lcformat.c | 31 +++++----- dlls/kernel32/locale.c | 4 -- dlls/kernel32/lzexpand.c | 9 +-- dlls/kernel32/module.c | 14 ++--- dlls/kernel32/path.c | 9 +-- dlls/kernel32/process.c | 21 +------ dlls/kernel32/profile.c | 140 +++++++++++++++++++++---------------------- dlls/kernel32/resource.c | 6 +- dlls/kernel32/sync.c | 7 --- dlls/kernel32/tests/loader.c | 22 ++----- dlls/kernel32/thread.c | 2 - dlls/kernel32/toolhelp.c | 5 -- dlls/kernel32/version.c | 4 -- dlls/kernel32/virtual.c | 11 +--- dlls/kernel32/volume.c | 3 - 25 files changed, 128 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c631ebb2354334eaf30…

1 0

Alexandre Julliard : ntdll: Use load_dll() to load kernel32 to support PE format.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: e5c0e8e296a114aeca41fcb67c73f55e1d37d002 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5c0e8e296a114aeca41fcb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:38:08 2020 +0200 ntdll: Use load_dll() to load kernel32 to support PE format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 319cdd8c8a..20bc3f977d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3987,7 +3987,7 @@ static NTSTATUS process_init(void) static const WCHAR ntdllW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\', 'n','t','d','l','l','.','d','l','l',0}; - static const WCHAR kernel32W[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + static const WCHAR kernel32W[] = {'C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\', 'k','e','r','n','e','l','3','2','.','d','l','l',0}; RTL_USER_PROCESS_PARAMETERS *params; @@ -4044,8 +4044,7 @@ static NTSTATUS process_init(void) status = build_builtin_module( params->DllPath.Buffer, &nt_name, meminfo.AllocationBase, 0, &wm ); assert( !status ); - RtlInitUnicodeString( &nt_name, kernel32W ); - if ((status = load_builtin_dll( params->DllPath.Buffer, &nt_name, NULL, 0, &wm )) != STATUS_SUCCESS) + if ((status = load_dll( params->DllPath.Buffer, kernel32W, NULL, 0, &wm )) != STATUS_SUCCESS) { MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); NtTerminateProcess( GetCurrentProcess(), status );

1 0

Alexandre Julliard : ntdll: Use the standard code path to load ntdll.dll.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 7cec3dc28492f2d43d706cde9afa4fcbc4ae87c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cec3dc28492f2d43d706cde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:38:23 2020 +0200 ntdll: Use the standard code path to load ntdll.dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 20 ++++------------- dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unix/virtual.c | 50 ------------------------------------------ 3 files changed, 4 insertions(+), 67 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index b8500b5772..6890a08428 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1438,24 +1438,12 @@ found: static void load_ntdll(void) { NTSTATUS status; + SECTION_IMAGE_INFORMATION info; void *module; - int fd; - char *name = build_path( dll_dir, "ntdll.dll" ); + char *name = build_path( dll_dir, "ntdll.dll.so" ); - if ((fd = open( name, O_RDONLY )) != -1) - { - struct stat st; - fstat( fd, &st ); - if (!(status = virtual_map_ntdll( fd, &module ))) - add_builtin_module( module, NULL, &st ); - close( fd ); - } - else - { - free( name ); - name = build_path( dll_dir, "ntdll.dll.so" ); - status = dlopen_dll( name, &module ); - } + name[strlen(name) - 3] = 0; /* remove .so */ + status = open_builtin_file( name, &module, &info ); if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); load_ntdll_functions( module ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 88a726d244..f99c13fe2a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -177,7 +177,6 @@ extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct o extern void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) DECLSPEC_HIDDEN; extern void *anon_mmap_alloc( size_t size, int prot ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_map_ntdll( int fd, void **module ) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_create_builtin_view( void *module ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 336666c358..d79e3de662 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2436,56 +2436,6 @@ void virtual_init(void) } -/*********************************************************************** - * virtual_map_ntdll - * - * Map ntdll, used instead of virtual_map_section() because some things are not initialized yet. - */ -NTSTATUS virtual_map_ntdll( int fd, void **module ) -{ - IMAGE_DOS_HEADER dos; - IMAGE_NT_HEADERS nt; - NTSTATUS status; - SIZE_T size; - void *base; - unsigned int vprot; - struct file_view *view; - - /* load the headers */ - - size = pread( fd, &dos, sizeof(dos), 0 ); - if (size < sizeof(dos)) return STATUS_INVALID_IMAGE_FORMAT; - if (dos.e_magic != IMAGE_DOS_SIGNATURE) return STATUS_INVALID_IMAGE_FORMAT; - - size = pread( fd, &nt, sizeof(nt), dos.e_lfanew ); - if (size < sizeof(nt)) return STATUS_INVALID_IMAGE_PROTECT; - if (nt.Signature != IMAGE_NT_SIGNATURE) return STATUS_INVALID_IMAGE_FORMAT; - if (nt.OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC) return STATUS_INVALID_IMAGE_FORMAT; -#ifdef __i386__ - if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_I386) return STATUS_INVALID_IMAGE_FORMAT; -#elif defined(__x86_64__) - if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64) return STATUS_INVALID_IMAGE_FORMAT; -#elif defined(__arm__) - if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_ARM && - nt.FileHeader.Machine != IMAGE_FILE_MACHINE_THUMB && - nt.FileHeader.Machine != IMAGE_FILE_MACHINE_ARMNT) return STATUS_INVALID_IMAGE_FORMAT; -#elif defined(__aarch64__) - if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_ARM64) return STATUS_INVALID_IMAGE_FORMAT; -#endif - - base = (void *)nt.OptionalHeader.ImageBase; - size = ROUND_SIZE( 0, nt.OptionalHeader.SizeOfImage ); - vprot = SEC_IMAGE | SEC_FILE | VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY; - - status = map_view( &view, base, size, FALSE, vprot, 0 ); - if (status == STATUS_CONFLICTING_ADDRESSES) - ERR( "couldn't load ntdll at preferred address %p\n", base ); - if (status) return status; - *module = view->base; - return map_image_into_view( view, fd, base, nt.OptionalHeader.SizeOfHeaders, 0, -1, FALSE ); -} - - /*********************************************************************** * get_system_affinity_mask */

1 0

Alexandre Julliard : ntdll: Delay ntdll.dll loading until more initialization is done.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 20e0fd6e991edf5c6b5c6c7c22632d16d346a690 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20e0fd6e991edf5c6b5c6c7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:38:17 2020 +0200 ntdll: Delay ntdll.dll loading until more initialization is done. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e7a7c96a97..b8500b5772 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1577,6 +1577,8 @@ static void start_main_thread(void) init_cpu_info(); init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); + load_ntdll(); + load_libwine(); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); if (status) exec_process( status ); server_init_process_done(); @@ -1785,10 +1787,7 @@ void __wine_main( int argc, char *argv[], char *envp[] ) #endif virtual_init(); - load_ntdll(); - init_environment( argc, argv, envp ); - load_libwine(); #ifdef __APPLE__ apple_main_thread();

1 0

Alexandre Julliard : kernel32: Remove the setting of the computer name keys.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 48e88074cdd09513164f8669b270d13425f4584c URL: https://source.winehq.org/git/wine.git/?a=commit;h=48e88074cdd09513164f8669… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 16:20:43 2020 +0200 kernel32: Remove the setting of the computer name keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/computername.c | 153 ----------------------------------------- dlls/kernel32/kernel_main.c | 3 - dlls/kernel32/kernel_private.h | 3 - 3 files changed, 159 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index f4b56335dd..949db04985 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -25,14 +25,7 @@ #include <stdarg.h> #include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #include <stdlib.h> -#include <errno.h> -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -43,155 +36,9 @@ #include "winternl.h" #include "wine/unicode.h" #include "wine/exception.h" -#include "wine/debug.h" #include "kernel_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(computername); - -/* Registry key and value names */ -static const WCHAR ComputerW[] = {'\\','R','e','g','i','s','t','r','y','\\', - 'M','a','c','h','i','n','e','\\', - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'C','o','m','p','u','t','e','r','N','a','m','e',0}; -static const WCHAR ActiveComputerNameW[] = {'A','c','t','i','v','e','C','o','m','p','u','t','e','r','N','a','m','e',0}; -static const WCHAR ComputerNameW[] = {'C','o','m','p','u','t','e','r','N','a','m','e',0}; - -static const WCHAR default_ComputerName[] = {'W','I','N','E',0}; - -/*********************************************************************** - * dns_gethostbyname (INTERNAL) - * - * From hostname(1): - * "The FQDN is the name gethostbyname(2) returns for the host name returned by gethostname(2)." - * - * Wine can use this technique only if the thread-safe gethostbyname_r is available. - */ -static void dns_gethostbyname ( char *name, int size ) -{ -#ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 - struct hostent* host = NULL; - char *extrabuf; - int ebufsize = 1024; - struct hostent hostentry; - int locerr = ENOBUFS, res; - - for (;;) - { - if (!(extrabuf = HeapAlloc( GetProcessHeap(), 0, ebufsize ))) return; - res = gethostbyname_r ( name, &hostentry, extrabuf, ebufsize, &host, &locerr ); - if( res != ERANGE ) break; - ebufsize *= 2; - HeapFree( GetProcessHeap(), 0, extrabuf ); - } - - if ( res ) - WARN ("Error in gethostbyname_r %d (%d)\n", res, locerr); - else if ( !host ) - WARN ("gethostbyname_r returned NULL host, locerr = %d\n", locerr); - else - if (strlen( host->h_name ) < size) strcpy( name, host->h_name ); - - HeapFree( GetProcessHeap(), 0, extrabuf ); -#endif -} - -/*********************************************************************** - * dns_fqdn (INTERNAL) - */ -static BOOL dns_fqdn ( char *name, int size ) -{ - if (gethostname( name, size )) - { - switch( errno ) - { - case ENAMETOOLONG: - SetLastError ( ERROR_MORE_DATA ); - break; - default: - SetLastError ( ERROR_INVALID_PARAMETER ); - break; - } - return FALSE; - } - dns_gethostbyname( name, size ); - return TRUE; -} - -/*********************************************************************** - * COMPUTERNAME_Init (INTERNAL) - */ -void COMPUTERNAME_Init (void) -{ - HANDLE hkey = INVALID_HANDLE_VALUE, hsubkey = INVALID_HANDLE_VALUE; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - char buf[offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ) + (MAX_COMPUTERNAME_LENGTH + 1) * sizeof( WCHAR )]; - DWORD len = sizeof( buf ); - const WCHAR *computer_name = (WCHAR *)(buf + offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data )); - NTSTATUS st = STATUS_INTERNAL_ERROR; - char hbuf[256]; - WCHAR *dot, bufW[256]; - - if (dns_fqdn( hbuf, sizeof(hbuf) )) - { - MultiByteToWideChar( CP_UNIXCP, 0, hbuf, -1, bufW, ARRAY_SIZE(bufW) ); - dot = strchrW( bufW, '.' ); - if (dot) *dot++ = 0; - else dot = bufW + strlenW(bufW); - SetComputerNameExW( ComputerNamePhysicalDnsDomain, dot ); - SetComputerNameExW( ComputerNamePhysicalDnsHostname, bufW ); - } - - TRACE("(void)\n"); - InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); - RtlInitUnicodeString( &nameW, ComputerW ); - if ( ( st = NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) ) != STATUS_SUCCESS ) - goto out; - - attr.RootDirectory = hkey; - RtlInitUnicodeString( &nameW, ComputerNameW ); - if ( (st = NtCreateKey( &hsubkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) ) != STATUS_SUCCESS ) - goto out; - - st = NtQueryValueKey( hsubkey, &nameW, KeyValuePartialInformation, buf, len, &len ); - - if ( st != STATUS_SUCCESS) - { - computer_name = default_ComputerName; - len = sizeof(default_ComputerName); - } - else - { - len = (len - offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data )); - } - - NtClose( hsubkey ); - TRACE(" ComputerName: %s (%u)\n", debugstr_w (computer_name), len); - - RtlInitUnicodeString( &nameW, ActiveComputerNameW ); - if ( ( st = NtCreateKey( &hsubkey, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, NULL ) ) - != STATUS_SUCCESS ) - goto out; - - RtlInitUnicodeString( &nameW, ComputerNameW ); - st = NtSetValueKey( hsubkey, &nameW, 0, REG_SZ, computer_name, len ); - -out: - NtClose( hsubkey ); - NtClose( hkey ); - - if ( st == STATUS_SUCCESS ) - TRACE( "success\n" ); - else - { - WARN( "status trying to set ComputerName: %x\n", st ); - SetLastError ( RtlNtStatusToDosError ( st ) ); - } -} - /*********************************************************************** * GetComputerNameW (KERNEL32.@) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 6f60768cbd..1823c8e650 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -132,9 +132,6 @@ static BOOL process_attach( HMODULE module ) NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); - /* Setup computer name */ - COMPUTERNAME_Init(); - CONSOLE_Init(params); copy_startup_info(); diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 5fb66d34ca..fe19e2ed5c 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -58,7 +58,4 @@ extern const WCHAR DIR_System[] DECLSPEC_HIDDEN; extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; -/* computername.c */ -extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN; - #endif

1 0

Alexandre Julliard : wineboot: Set the computer name keys.
by Alexandre Julliard 28 Sep '20

28 Sep '20

Module: wine Branch: master Commit: 6a19b999f7877f5b0052c77d09a41635769ce441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a19b999f7877f5b0052c77d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 16:20:04 2020 +0200 wineboot: Set the computer name keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/Makefile.in | 2 +- programs/wineboot/wineboot.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 3921fa9644..2552f69990 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,6 +1,6 @@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = uuid advapi32 +IMPORTS = uuid advapi32 ws2_32 DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev EXTRADLLFLAGS = -mno-cygwin diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 2f8b7169cf..fa1c459035 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -64,6 +64,7 @@ #include <ntstatus.h> #define WIN32_NO_STATUS #include <windows.h> +#include <ws2tcpip.h> #include <winternl.h> #include <ddk/wdm.h> #include <sddl.h> @@ -815,6 +816,42 @@ static void create_environment_registry_keys( void ) RegCloseKey( env_key ); } +/* create the ComputerName registry keys */ +static void create_computer_name_keys(void) +{ + struct addrinfo hints = {0}, *res; + char *dot, buffer[256]; + HKEY key, subkey; + + if (gethostname( buffer, sizeof(buffer) )) return; + hints.ai_flags = AI_CANONNAME; + if (getaddrinfo( buffer, NULL, &hints, &res )) return; + dot = strchr( res->ai_canonname, '.' ); + if (dot) *dot++ = 0; + else dot = res->ai_canonname + strlen(res->ai_canonname); + SetComputerNameExA( ComputerNamePhysicalDnsDomain, dot ); + SetComputerNameExA( ComputerNamePhysicalDnsHostname, res->ai_canonname ); + freeaddrinfo( res ); + + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\ComputerName", &key )) + return; + + if (!RegOpenKeyW( key, L"ComputerName", &subkey )) + { + DWORD type, size = sizeof(buffer); + + if (RegQueryValueExW( subkey, L"ComputerName", NULL, &type, (BYTE *)buffer, &size )) size = 0; + RegCloseKey( subkey ); + if (size && !RegCreateKeyExW( key, L"ActiveComputerName", 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &subkey, NULL )) + { + RegSetValueExW( subkey, L"ComputerName", 0, type, (const BYTE *)buffer, size ); + RegCloseKey( subkey ); + } + } + RegCloseKey( key ); +} + static void create_volatile_environment_registry_key(void) { WCHAR path[MAX_PATH]; @@ -1657,6 +1694,7 @@ int __cdecl main( int argc, char *argv[] ) create_hardware_registry_keys(); create_dynamic_registry_keys(); create_environment_registry_keys(); + create_computer_name_keys(); wininit(); pendingRename();

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
71
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 September 2020