November 2019 - Wine-commits

Piotr Caban : user32: Include png.h only if SONAME_LIBPNG is defined.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: cfa9334125f6a4ae7296b3931af5f1af93fc1029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfa9334125f6a4ae7296b393… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 7 22:02:36 2019 +0100 user32: Include png.h only if SONAME_LIBPNG is defined. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 9c61d7ff30..6413d22d03 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -31,7 +31,7 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h> -#ifdef HAVE_PNG_H +#ifdef SONAME_LIBPNG #include <png.h> #endif

1 0

Piotr Caban : windowscodecs: Include png.h only if SONAME_LIBPNG is defined.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 88d30985ddd534e8bafed531e619846bc8d10839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88d30985ddd534e8bafed531… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 7 22:02:43 2019 +0100 windowscodecs: Include png.h only if SONAME_LIBPNG is defined. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c0e272e86f..a79df632ef 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -22,7 +22,7 @@ #include <stdarg.h> -#ifdef HAVE_PNG_H +#ifdef SONAME_LIBPNG #include <png.h> #endif @@ -2183,7 +2183,7 @@ HRESULT PngEncoder_CreateInstance(REFIID iid, void** ppv) return ret; } -#else /* !HAVE_PNG_H */ +#else /* !SONAME_LIBPNG */ HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) {

1 0

Zhiyi Zhang : user32/tests: Fix test failures on multiple monitor setup.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 6b2b004c0ca0427a3337953efab4e59c0e67cd8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2b004c0ca0427a3337953e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 7 22:04:31 2019 +0800 user32/tests: Fix test failures on multiple monitor setup. The desktop window rectangle is the same as that of primary monitor for compatibility reasons. It equals to virtual screen rectangle only when there are no more than two active and non-mirrored monitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index f74c9e7561..645c188008 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3225,6 +3225,7 @@ static void test_dpi_mapping(void) ULONG_PTR i, j, k; WINDOWPLACEMENT wpl_orig, wpl; HMONITOR monitor; + INT monitor_count; MONITORINFO mon_info; DPI_AWARENESS_CONTEXT context; @@ -3235,6 +3236,7 @@ static void test_dpi_mapping(void) } context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); GetWindowRect( GetDesktopWindow(), &desktop ); + monitor_count = GetSystemMetrics( SM_CMONITORS ); for (i = DPI_AWARENESS_UNAWARE; i <= DPI_AWARENESS_PER_MONITOR_AWARE; i++) { pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ); @@ -3247,9 +3249,12 @@ static void test_dpi_mapping(void) SetRect( &rect, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN )); ok( EqualRect( &expect, &rect ), "%lu: wrong desktop rect %s expected %s\n", i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); - SetRect( &rect, 0, 0, GetSystemMetrics( SM_CXVIRTUALSCREEN ), GetSystemMetrics( SM_CYVIRTUALSCREEN )); - ok( EqualRect( &expect, &rect ), "%lu: wrong virt desktop rect %s expected %s\n", - i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); + if (monitor_count < 2) + { + SetRect( &rect, 0, 0, GetSystemMetrics( SM_CXVIRTUALSCREEN ), GetSystemMetrics( SM_CYVIRTUALSCREEN )); + ok( EqualRect( &expect, &rect ), "%lu: wrong virt desktop rect %s expected %s\n", + i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); + } SetRect( &rect, 0, 0, 1, 1 ); monitor = MonitorFromRect( &rect, MONITOR_DEFAULTTOPRIMARY ); ok( monitor != 0, "failed to get monitor\n" );

1 0

Zhiyi Zhang : user32/tests: Fix monitor test failures on some systems.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: b95c4c229c87e31130637fc461034cdd06675dda URL: https://source.winehq.org/git/wine.git/?a=commit;h=b95c4c229c87e31130637fc4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 7 22:06:18 2019 +0800 user32/tests: Fix monitor test failures on some systems. On some systems, the monitor name may not be Default_Monitor, so check format instead. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 53 +++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 38 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 26ee28a122..04e63dc38d 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -81,8 +81,6 @@ static int monitor_count = 0; static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *device, DWORD flags) { - char video_name[32]; - char video_value[128]; char buffer[128]; int number; int vendor_id; @@ -90,10 +88,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de int subsys_id; int revision_id; size_t length; - HKEY hkey; HDC hdc; - DWORD size; - LSTATUS ls; adapter_count++; @@ -102,25 +97,10 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de device->DeviceName); /* DeviceKey */ - /* win7 is the only OS version where \Device\Video? value in HLKM\HARDWARE\DEVICEMAP\VIDEO are not in order with adapter index. */ - if (GetVersion() != 0x1db10106 || !strcmp(winetest_platform, "wine")) - { - sprintf(video_name, "\\Device\\Video%d", index); - ls = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", 0, KEY_READ, &hkey); - ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); - if (!ls) - { - memset(video_value, 0, sizeof(video_value)); - size = sizeof(video_value); - ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); - ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); - RegCloseKey(hkey); - ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); - } - } - else - ok(sscanf(device->DeviceKey, "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Video\\%[^\\]\\%04d", buffer, &number) == 2, - "#%d: wrong DeviceKey %s\n", index, device->DeviceKey); + /* \Device\Video? value in HLKM\HARDWARE\DEVICEMAP\VIDEO are not necessarily in order with adapter index. + * Check format only */ + ok(sscanf(device->DeviceKey, "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Video\\%[^\\]\\%04d", buffer, &number) == 2, + "#%d: wrong DeviceKey %s\n", index, device->DeviceKey); /* DeviceString */ length = strlen(device->DeviceString); @@ -159,9 +139,8 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de } static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index, const char *adapter_name, - const DISPLAY_DEVICEA *device, DWORD flags) + DISPLAY_DEVICEA *device, DWORD flags) { - static const char device_id_prefix[] = "MONITOR\\Default_Monitor\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\"; static const char device_key_prefix[] = "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class" "\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\"; char monitor_name[32]; @@ -186,24 +165,22 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index device->StateFlags); /* DeviceID */ - lstrcpynA(buffer, device->DeviceID, sizeof(device_id_prefix)); + CharLowerA(device->DeviceID); if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\4&2abfaa30&0&UID0 GUID_DEVINTERFACE_MONITOR - * ^ ^ ^ - * Expect format \\?\DISPLAY#Default_Monitor#4&2abfaa30&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ + { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\[monitor name]\[instance id] GUID_DEVINTERFACE_MONITOR + * ^ ^ ^ + * Expect format \\?\DISPLAY#[monitor name]#[instance id]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ - sscanf(device->DeviceID, "\\\\?\\DISPLAY#Default_Monitor#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer) == 1 || /* win8+ */ - (!lstrcmpiA(buffer, device_id_prefix) && - sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1), /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ - "#%d: wrong DeviceID : %s\n", monitor_index, device->DeviceID); + sscanf(device->DeviceID, "\\\\?\\display#%[^#]#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer, buffer) == 2 || /* win8+ */ + sscanf(device->DeviceID, "monitor\\%[^\\]\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\%04d", buffer, &number) == 2, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ + "#%d: wrong DeviceID : %s\n", monitor_index, device->DeviceID); } else { - /* Expect HarewareID value data + Driver value data in HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\{Instance} */ + /* Expect HarewareID value data + Driver value data in HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\[monitor name]\{instance} */ /* But we don't know which monitor instance this belongs to, so check format instead */ - ok(!lstrcmpiA(buffer, device_id_prefix), "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); - ok(sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1, - "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + ok(sscanf(device->DeviceID, "monitor\\%[^\\]\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\%04d", buffer, &number) == 2, + "#%d: wrong DeviceID : %s\n", monitor_index, device->DeviceID); } /* DeviceKey */

1 0

Alexandre Julliard : ntdll: Initialize earlier things that need the executable name.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: b7db0b52cee65a008f503ce727befcad3ba8d28a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7db0b52cee65a008f503ce7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 7 16:54:31 2019 +0100 ntdll: Initialize earlier things that need the executable name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 45 ++++++++++++++++++++++----------------------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/version.c | 33 +++++++++++++++------------------ 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cc7bf6900b..b16d646bdd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3832,28 +3832,33 @@ static void load_global_options(void) attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &name_str, sessionW ); - if (NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr )) return; - - query_dword_option( hkey, globalflagW, &NtCurrentTeb()->Peb->NtGlobalFlag ); - query_dword_option( hkey, safesearchW, &path_safe_mode ); - query_dword_option( hkey, safedllmodeW, &dll_safe_mode ); + if (!NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr )) + { + query_dword_option( hkey, globalflagW, &NtCurrentTeb()->Peb->NtGlobalFlag ); + query_dword_option( hkey, safesearchW, &path_safe_mode ); + query_dword_option( hkey, safedllmodeW, &dll_safe_mode ); - if (!query_dword_option( hkey, critsectW, &value )) - NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart = (ULONGLONG)value * -10000000; + if (!query_dword_option( hkey, critsectW, &value )) + NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart = (ULONGLONG)value * -10000000; - if (!query_dword_option( hkey, heapresW, &value )) - NtCurrentTeb()->Peb->HeapSegmentReserve = value; + if (!query_dword_option( hkey, heapresW, &value )) + NtCurrentTeb()->Peb->HeapSegmentReserve = value; - if (!query_dword_option( hkey, heapcommitW, &value )) - NtCurrentTeb()->Peb->HeapSegmentCommit = value; + if (!query_dword_option( hkey, heapcommitW, &value )) + NtCurrentTeb()->Peb->HeapSegmentCommit = value; - if (!query_dword_option( hkey, decommittotalW, &value )) - NtCurrentTeb()->Peb->HeapDeCommitTotalFreeThreshold = value; + if (!query_dword_option( hkey, decommittotalW, &value )) + NtCurrentTeb()->Peb->HeapDeCommitTotalFreeThreshold = value; - if (!query_dword_option( hkey, decommitfreeW, &value )) - NtCurrentTeb()->Peb->HeapDeCommitFreeBlockThreshold = value; + if (!query_dword_option( hkey, decommitfreeW, &value )) + NtCurrentTeb()->Peb->HeapDeCommitFreeBlockThreshold = value; - NtClose( hkey ); + NtClose( hkey ); + } + LdrQueryImageFileExecutionOptions( &NtCurrentTeb()->Peb->ProcessParameters->ImagePathName, + globalflagW, REG_DWORD, &NtCurrentTeb()->Peb->NtGlobalFlag, + sizeof(DWORD), NULL ); + heap_set_debug_flags( GetProcessHeap() ); } @@ -4223,8 +4228,6 @@ void __wine_process_init(void) 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}; - static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; - WINE_MODREF *wm; NTSTATUS status; ANSI_STRING func_name; @@ -4239,6 +4242,7 @@ void __wine_process_init(void) umask( FILE_umask ); load_global_options(); + version_init(); /* setup the load callback and create ntdll modref */ wine_dll_set_callback( load_builtin_callback ); @@ -4268,13 +4272,8 @@ void __wine_process_init(void) } NtCurrentTeb()->Peb->LoaderLock = &loader_section; - version_init( wm->ldr.FullDllName.Buffer ); virtual_set_large_address_space(); - LdrQueryImageFileExecutionOptions( &wm->ldr.FullDllName, globalflagW, REG_DWORD, - &NtCurrentTeb()->Peb->NtGlobalFlag, sizeof(DWORD), NULL ); - heap_set_debug_flags( GetProcessHeap() ); - /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e2280dea84..074792ff2a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -77,7 +77,7 @@ extern void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL s extern void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_process( int status ) DECLSPEC_HIDDEN; -extern void version_init( const WCHAR *appname ) DECLSPEC_HIDDEN; +extern void version_init(void) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; extern void thread_init(void) DECLSPEC_HIDDEN; extern void actctx_init(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 9c9f2cc8cd..bd03382899 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -485,7 +485,7 @@ static BOOL parse_win_version( HANDLE hkey ) /********************************************************************** * version_init */ -void version_init( const WCHAR *appname ) +void version_init(void) { static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0}; @@ -493,6 +493,8 @@ void version_init( const WCHAR *appname ) UNICODE_STRING nameW; HANDLE root, hkey, config_key; BOOL got_win_ver = FALSE; + const WCHAR *p, *appname = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + WCHAR appversion[MAX_PATH+20]; current_version = &VersionData[WIN7]; @@ -511,26 +513,21 @@ void version_init( const WCHAR *appname ) if (!config_key) goto done; /* open AppDefaults\\appname key */ - if (appname && *appname) - { - const WCHAR *p; - WCHAR appversion[MAX_PATH+20]; - if ((p = strrchrW( appname, '/' ))) appname = p + 1; - if ((p = strrchrW( appname, '\\' ))) appname = p + 1; + if ((p = strrchrW( appname, '/' ))) appname = p + 1; + if ((p = strrchrW( appname, '\\' ))) appname = p + 1; - strcpyW( appversion, appdefaultsW ); - strcatW( appversion, appname ); - RtlInitUnicodeString( &nameW, appversion ); - attr.RootDirectory = config_key; + strcpyW( appversion, appdefaultsW ); + strcatW( appversion, appname ); + RtlInitUnicodeString( &nameW, appversion ); + attr.RootDirectory = config_key; - /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe */ - if (!NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) - { - TRACE( "getting version from %s\n", debugstr_w(appversion) ); - got_win_ver = parse_win_version( hkey ); - NtClose( hkey ); - } + /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe */ + if (!NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) + { + TRACE( "getting version from %s\n", debugstr_w(appversion) ); + got_win_ver = parse_win_version( hkey ); + NtClose( hkey ); } if (!got_win_ver)

1 0

Alexandre Julliard : ntdll: Move some initializations out of thread_init().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 608d086f1b1bb7168e9322c65224c23f34e75f29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=608d086f1b1bb7168e9322c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 7 17:00:39 2019 +0100 ntdll: Move some initializations out of thread_init(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 36 ++++++++++++++++++++++-------------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/thread.c | 22 +++------------------- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b16d646bdd..98c3f2d950 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4234,8 +4234,22 @@ void __wine_process_init(void) UNICODE_STRING nt_name; void * (CDECL *init_func)(void); INITIAL_TEB stack; + BOOL suspend; + SIZE_T info_size; + TEB *teb = thread_init(); + PEB *peb = teb->Peb; - thread_init(); + /* setup the server connection */ + server_init_process(); + info_size = server_init_thread( peb, &suspend ); + + peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ); + peb->LoaderLock = &loader_section; + + init_directories(); + init_user_process_params( info_size ); + + NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); /* retrieve current umask */ FILE_umask = umask(0777); @@ -4263,7 +4277,7 @@ void __wine_process_init(void) kernel32_start_process = init_func(); - wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); + wm = get_modref( peb->ImageBaseAddress ); assert( wm ); if (wm->ldr.Flags & LDR_IMAGE_IS_DLL) { @@ -4271,24 +4285,18 @@ void __wine_process_init(void) exit(1); } - NtCurrentTeb()->Peb->LoaderLock = &loader_section; virtual_set_large_address_space(); /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); - InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); + InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); - InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); + InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); - if ((status = virtual_alloc_thread_stack( &stack, 0, 0, NULL )) != STATUS_SUCCESS) - { - ERR( "Main exe initialization for %s failed, status %x\n", - debugstr_w(wm->ldr.FullDllName.Buffer), status ); - NtTerminateProcess( GetCurrentProcess(), status ); - } - NtCurrentTeb()->Tib.StackBase = stack.StackBase; - NtCurrentTeb()->Tib.StackLimit = stack.StackLimit; - NtCurrentTeb()->DeallocationStack = stack.DeallocationStack; + virtual_alloc_thread_stack( &stack, 0, 0, NULL ); + teb->Tib.StackBase = stack.StackBase; + teb->Tib.StackLimit = stack.StackLimit; + teb->DeallocationStack = stack.DeallocationStack; server_init_process_done(); } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 074792ff2a..eb31bb5bce 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -79,7 +79,7 @@ extern void DECLSPEC_NORETURN signal_exit_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_process( int status ) DECLSPEC_HIDDEN; extern void version_init(void) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; -extern void thread_init(void) DECLSPEC_HIDDEN; +extern TEB *thread_init(void) DECLSPEC_HIDDEN; extern void actctx_init(void) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern void virtual_init_threading(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index be54f89082..621aaddfe3 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -220,12 +220,11 @@ static void set_process_name( int argc, char *argv[] ) * * NOTES: The first allocated TEB on NT is at 0x7ffde000. */ -void thread_init(void) +TEB *thread_init(void) { TEB *teb; void *addr; - BOOL suspend; - SIZE_T size, info_size; + SIZE_T size; LARGE_INTEGER now; NTSTATUS status; struct ntdll_thread_data *thread_data; @@ -299,21 +298,7 @@ void thread_init(void) signal_init_thread( teb ); virtual_init_threading(); debug_init(); - - /* setup the server connection */ - server_init_process(); - info_size = server_init_thread( peb, &suspend ); - - /* create the process heap */ - if (!(peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ))) - { - MESSAGE( "wine: failed to create the process heap\n" ); - exit(1); - } - set_process_name( __wine_main_argc, __wine_main_argv ); - init_directories(); - init_user_process_params( info_size ); /* initialize time values in user_shared_data */ NtQuerySystemTime( &now ); @@ -323,10 +308,9 @@ void thread_init(void) user_shared_data->u.TickCount.High2Time = user_shared_data->u.TickCount.High1Time; user_shared_data->TickCountLowDeprecated = user_shared_data->u.TickCount.LowPart; user_shared_data->TickCountMultiplier = 1 << 24; - fill_cpu_info(); - NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); + return teb; }

1 0

Alexandre Julliard : ntdll: Load the main binary directly in ntdll when possible.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: b0199ea2fe8f9b77aee7ab4f68c9ae1755442586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0199ea2fe8f9b77aee7ab4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 7 18:54:21 2019 +0100 ntdll: Load the main binary directly in ntdll when possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 8 +++---- dlls/ntdll/loader.c | 58 ++++++++++++++++++++++++++++++++----------------- dlls/ntdll/process.c | 6 ++--- 3 files changed, 45 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0199ea2fe8f9b77aee7…

1 0

Jacek Caban : winemac.drv: Make sure that NSMiniaturizableWindowMask style mask is set before calling miniaturize.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 7c29f5a3b3177be955a3fcb1ff4a22b7843c851e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c29f5a3b3177be955a3fcb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 6 15:19:23 2019 +0100 winemac.drv: Make sure that NSMiniaturizableWindowMask style mask is set before calling miniaturize. miniaturize fails to minimize window when NSMiniaturizableWindowMask style is not set. The style will be restored on window restore (or earlier). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0bc4d38f4d..877653ea00 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1289,6 +1289,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } else { + [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)]; [super miniaturize:nil]; discard |= event_mask_for_type(WINDOW_BROUGHT_FORWARD) | event_mask_for_type(WINDOW_GOT_FOCUS) | @@ -1763,6 +1764,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if (pendingMinimize) { + [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)]; [super miniaturize:nil]; pendingMinimize = FALSE; }

1 0

Jacek Caban : scrrun: Rewrite text stream to use read ahead buffer.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: c80e16ae190b4a6a26d6dcc403ed24c65169ed26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c80e16ae190b4a6a26d6dcc4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 17:10:24 2019 +0100 scrrun: Rewrite text stream to use read ahead buffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 231 ++++++++++++++++++++++++----------------------- 1 file changed, 120 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c80e16ae190b4a6a26d6…

1 0

Jacek Caban : scrrun: Add ITextStream::ReadLine implementation.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 14de44513f343ad0e9590df07a877a6d250964bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=14de44513f343ad0e9590df0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 17:10:32 2019 +0100 scrrun: Add ITextStream::ReadLine implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 33 ++++++++++++++++++++++++--------- dlls/scrrun/tests/filesystem.c | 6 ------ 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index b05a814593..5893435af7 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -21,6 +21,7 @@ #include <stdarg.h> #include <limits.h> #include <assert.h> +#include <wchar.h> #include "windef.h" #include "winbase.h" @@ -499,10 +500,11 @@ static HRESULT WINAPI textstream_Read(ITextStream *iface, LONG len, BSTR *text) static HRESULT WINAPI textstream_ReadLine(ITextStream *iface, BSTR *text) { struct textstream *This = impl_from_ITextStream(iface); - VARIANT_BOOL eos; - HRESULT hr; + unsigned int skip = 0; + const WCHAR *nl; + HRESULT hr = S_OK; - FIXME("(%p)->(%p): stub\n", This, text); + TRACE("(%p)->(%p)\n", This, text); if (!text) return E_POINTER; @@ -511,15 +513,28 @@ static HRESULT WINAPI textstream_ReadLine(ITextStream *iface, BSTR *text) if (textstream_check_iomode(This, IORead)) return CTL_E_BADFILEMODE; - /* check for EOF */ - hr = ITextStream_get_AtEndOfStream(iface, &eos); - if (FAILED(hr)) - return hr; + while (!(nl = wmemchr(This->read_buf, '\n', This->read_buf_size)) && !This->eof) + { + if (FAILED(hr = read_more_data(This))) + return hr; + } - if (eos == VARIANT_TRUE) + if (This->eof && !This->read_buf_size) return CTL_E_ENDOFFILE; - return E_NOTIMPL; + if (!nl) + { + nl = This->read_buf + This->read_buf_size; + hr = S_FALSE; + } + else if (nl > This->read_buf && nl[-1] == '\r') + { + nl--; + skip = 2; + } + else skip = 1; + + return read_from_buffer(This, nl - This->read_buf, text, skip) ? hr : E_OUTOFMEMORY; } static HRESULT WINAPI textstream_ReadAll(ITextStream *iface, BSTR *text) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 3b4af3c498..2d5c6e4138 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1732,10 +1732,8 @@ static void test_ReadAll(void) str = NULL; hr = ITextStream_ReadLine(stream, &str); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(str != NULL, "got %p\n", str); -} SysFreeString(str); lstrcpyW(buffW, secondlineW); @@ -1743,7 +1741,6 @@ todo_wine { str = NULL; hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); -todo_wine ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1880,10 +1877,8 @@ static void test_Read(void) str = NULL; hr = ITextStream_ReadLine(stream, &str); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(str != NULL, "got %p\n", str); -} SysFreeString(str); lstrcpyW(buffW, secondlineW); @@ -1891,7 +1886,6 @@ todo_wine { str = NULL; hr = ITextStream_Read(stream, 100, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); -todo_wine ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); ITextStream_Release(stream);

1 0