November 2019 - Wine-Commits

Alexandre Julliard : ntdll: Initialize earlier things that need the executable name.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

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

Zhiyi Zhang : user32/tests: Fix monitor test failures on some systems.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

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

Jacek Caban : scrrun: Rewrite text stream to use read ahead buffer.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

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

Gabriel Ivăncescu : jscript: Use standard list for the queued code.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: 5e4f0f40860755da3588d14d2c27a055a650acee URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e4f0f40860755da3588d14d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 7 18:17:06 2019 +0100 jscript: Use standard list for the queued code. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.h | 2 +- dlls/jscript/jscript.c | 27 ++++++++------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index a3b598e534..1d76cf8f2f 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -185,7 +185,7 @@ typedef struct _bytecode_t { unsigned str_pool_size; unsigned str_cnt; - struct _bytecode_t *next; + struct list entry; } bytecode_t; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 2a7c028454..9a03f36b26 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -60,8 +60,7 @@ typedef struct { IActiveScriptSite *site; - bytecode_t *queue_head; - bytecode_t *queue_tail; + struct list queued_code; } JScript; void script_release(script_ctx_t *ctx) @@ -117,27 +116,19 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) static void clear_script_queue(JScript *This) { - bytecode_t *iter, *iter2; - - if(!This->queue_head) - return; - - iter = This->queue_head; - while(iter) { - iter2 = iter->next; - iter->next = NULL; + while(!list_empty(&This->queued_code)) + { + bytecode_t *iter = LIST_ENTRY(list_head(&This->queued_code), bytecode_t, entry); + list_remove(&iter->entry); release_bytecode(iter); - iter = iter2; } - - This->queue_head = This->queue_tail = NULL; } static void exec_queued_code(JScript *This) { bytecode_t *iter; - for(iter = This->queue_head; iter; iter = iter->next) + LIST_FOR_EACH_ENTRY(iter, &This->queued_code, bytecode_t, entry) exec_global_code(This, iter); clear_script_queue(This); @@ -793,10 +784,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, * script is executed immediately, even if it's not in started state yet. */ if(!pvarResult && !is_started(This->ctx)) { - if(This->queue_tail) - This->queue_tail = This->queue_tail->next = code; - else - This->queue_head = This->queue_tail = code; + list_add_tail(&This->queued_code, &code->entry); return S_OK; } @@ -1089,6 +1077,7 @@ HRESULT create_jscript_object(BOOL is_encode, REFIID riid, void **ppv) ret->ref = 1; ret->safeopt = INTERFACE_USES_DISPEX; ret->is_encode = is_encode; + list_init(&ret->queued_code); hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface);

1 0

Gabriel Ivăncescu : jscript/tests: Use integers instead of booleans for counting call expectations.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: af245b027bd27aacbdd4f64de6af837ef8858af8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af245b027bd27aacbdd4f64d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 7 18:17:20 2019 +0100 jscript/tests: Use integers instead of booleans for counting call expectations. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/jscript.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 4c5aa6cc2f..b97e823d58 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -51,27 +51,27 @@ static const CLSID CLSID_JScriptEncode = {0xf414c262,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; #define DEFINE_EXPECT(func) \ - static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + static int expect_ ## func = 0, called_ ## func = 0 #define SET_EXPECT(func) \ - expect_ ## func = TRUE + expect_ ## func = 1 #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ - called_ ## func = TRUE; \ + called_ ## func++; \ }while(0) #define CHECK_EXPECT(func) \ do { \ CHECK_EXPECT2(func); \ - expect_ ## func = FALSE; \ + expect_ ## func--; \ }while(0) #define CHECK_CALLED(func) \ do { \ ok(called_ ## func, "expected " #func "\n"); \ - expect_ ## func = called_ ## func = FALSE; \ + expect_ ## func = called_ ## func = 0; \ }while(0) DEFINE_EXPECT(GetLCID);

1 0

Jacek Caban : scrrun/tests: Add test of lost trailing byte in unicode srteam.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: 9294823a7b680a86beee199784d3240cca662041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9294823a7b680a86beee1997… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 17:10:49 2019 +0100 scrrun/tests: Add test of lost trailing byte in unicode srteam. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 3bd8634f25..68ac70ce3a 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2032,6 +2032,32 @@ static void test_Read(void) ITextStream_Release(stream); + /* ASCII file, read with Unicode stream */ + /* 3. one byte content, 2 are interpreted as a character, 3rd is lost */ + hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + str = SysAllocString(L"abc"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(SysStringLen(str) == 1, "len = %u\n", SysStringLen(str)); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == CTL_E_ENDOFFILE, "got 0x%08x\n", hr); + ok(str == NULL, "got %p\n", str); + + ITextStream_Release(stream); + DeleteFileW(nameW); RemoveDirectoryW(dirW); SysFreeString(nameW);

1 0

Jacek Caban : scrrun/tests: Add ITextStream::ReadLine tests.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: f2b681db7771ff275fb0d4b9e0edb5496dba620c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2b681db7771ff275fb0d4b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 17:10:36 2019 +0100 scrrun/tests: Add ITextStream::ReadLine tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 71 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 2d5c6e4138..3bd8634f25 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1734,6 +1734,7 @@ static void test_ReadAll(void) hr = ITextStream_ReadLine(stream, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok(str != NULL, "got %p\n", str); + ok(!wcscmp(str, nameW), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); lstrcpyW(buffW, secondlineW); @@ -2036,6 +2037,75 @@ static void test_Read(void) SysFreeString(nameW); } +static void test_ReadLine(void) +{ + WCHAR path[MAX_PATH], dir[MAX_PATH]; + ITextStream *stream; + unsigned int i; + HANDLE file; + DWORD size; + HRESULT hr; + BSTR str; + BOOL ret; + + const char data[] = "first line\r\nsecond\n\n\rt\r\re \rst\n"; + + get_temp_filepath(L"test.txt", path, dir); + + ret = CreateDirectoryW(dir, NULL); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + + for (i = 0; i < 1000; i++) + WriteFile(file, data, strlen(data), &size, NULL); + CloseHandle(file); + + str = SysAllocString(path); + hr = IFileSystem3_OpenTextFile(fs3, str, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + for (i = 0; i < 1000; i++) + { + hr = ITextStream_ReadLine(stream, &str); + ok(hr == S_OK, "ReadLine failed: %08x\n", hr); + ok(!wcscmp(str, L"first line"), "ReadLine returned %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = ITextStream_ReadLine(stream, &str); + ok(hr == S_OK, "ReadLine failed: %08x\n", hr); + ok(!wcscmp(str, L"second"), "ReadLine returned %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = ITextStream_ReadLine(stream, &str); + ok(hr == S_OK, "ReadLine failed: %08x\n", hr); + ok(!*str, "ReadLine returned %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = ITextStream_ReadLine(stream, &str); + ok(hr == S_OK, "ReadLine failed: %08x\n", hr); + ok(!wcscmp(str, L"\rt\r\re \rst"), "ReadLine returned %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + + str = NULL; + hr = ITextStream_ReadLine(stream, &str); + ok(hr == CTL_E_ENDOFFILE, "got 0x%08x\n", hr); + ok(!str, "ReadLine returned %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextStream_Release(stream); + + ret = DeleteFileW(path); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); + + ret = RemoveDirectoryW(dir); + ok(ret, "RemoveDirectory failed: %u\n", GetLastError()); +} + struct driveexists_test { const WCHAR drivespec[10]; const INT drivetype; @@ -2403,6 +2473,7 @@ START_TEST(filesystem) test_WriteLine(); test_ReadAll(); test_Read(); + test_ReadLine(); test_DriveExists(); test_GetDriveName(); test_GetDrive();

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetViewport().
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: 227d5a32e3b8d76720e2dea8d30088ef3b4c3a85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=227d5a32e3b8d76720e2dea8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:24 2019 -0600 ddraw: Handle stateblocks in d3d_device7_SetViewport(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cef865948b..e2643e6589 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5358,7 +5358,9 @@ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi vp.min_z = viewport->dvMinZ; vp.max_z = viewport->dvMaxZ; - wined3d_device_set_viewports(device->wined3d_device, 1, &vp); + wined3d_stateblock_set_viewport(device->update_state, &vp); + if (!device->recording) + wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : ntoskrnl.exe: IoInvalidateDeviceRelations() receives the parent PDO.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: ca683dcaadadf86dacd797b2d7c2ad1fca0155c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca683dcaadadf86dacd797b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 23:55:02 2019 -0600 ntoskrnl.exe: IoInvalidateDeviceRelations() receives the parent PDO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 +++- dlls/ntoskrnl.exe/ntoskrnl_private.h | 6 +++ dlls/ntoskrnl.exe/pnp.c | 84 +++++++++++++++++++++++++++++++----- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 2 +- dlls/winebus.sys/main.c | 13 +++--- 8 files changed, 96 insertions(+), 22 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f53434aedf..93c9720e96 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1471,6 +1471,7 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, { static const WCHAR auto_format[] = {'\\','D','e','v','i','c','e','\\','%','0','8','x',0}; NTSTATUS status; + struct wine_device *wine_device; DEVICE_OBJECT *device; HANDLE manager = get_device_manager(); static unsigned int auto_idx = 0; @@ -1479,11 +1480,12 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, TRACE( "(%p, %u, %s, %u, %x, %u, %p)\n", driver, ext_size, debugstr_us(name), type, characteristics, exclusive, ret_device ); - if (!(device = alloc_kernel_object( IoDeviceObjectType, NULL, sizeof(DEVICE_OBJECT) + ext_size, 1 ))) + if (!(wine_device = alloc_kernel_object( IoDeviceObjectType, NULL, sizeof(struct wine_device) + ext_size, 1 ))) return STATUS_NO_MEMORY; + device = &wine_device->device_obj; device->DriverObject = driver; - device->DeviceExtension = device + 1; + device->DeviceExtension = wine_device + 1; device->DeviceType = type; device->StackSize = 1; @@ -1549,9 +1551,11 @@ void WINAPI IoDeleteDevice( DEVICE_OBJECT *device ) if (status == STATUS_SUCCESS) { + struct wine_device *wine_device = CONTAINING_RECORD(device, struct wine_device, device_obj); DEVICE_OBJECT **prev = &device->DriverObject->DeviceObject; while (*prev && *prev != device) prev = &(*prev)->NextDevice; if (*prev) *prev = (*prev)->NextDevice; + ExFreePool( wine_device->children ); ObDereferenceObject( device ); } } diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index b5244ef164..256e945e6f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -86,4 +86,10 @@ static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', '\\','S','e','r','v','i','c','e','s', '\\',0}; + +struct wine_device +{ + DEVICE_OBJECT device_obj; + DEVICE_RELATIONS *children; +}; #endif diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index a3dbe772ae..62a32a4afc 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -318,25 +318,18 @@ static void start_device( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINFO_DATA * } } -static void handle_bus_relations( DEVICE_OBJECT *device ) +static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) { static const WCHAR infpathW[] = {'I','n','f','P','a','t','h',0}; SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; BOOL need_driver = TRUE; - HDEVINFO set; HKEY key; - /* We could (should?) do a full IRP_MN_QUERY_DEVICE_RELATIONS query, - * but we don't have to, we have the DEVICE_OBJECT of the new device - * so we can simply handle the process here */ - if (get_device_instance_id( device, device_instance_id )) return; - set = SetupDiCreateDeviceInfoList( NULL, NULL ); - if (!SetupDiCreateDeviceInfoW( set, device_instance_id, &GUID_NULL, NULL, NULL, 0, &sp_device ) && !SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device )) { @@ -364,19 +357,90 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) } start_device( device, set, &sp_device ); - - SetupDiDestroyDeviceInfoList( set ); } static void remove_device( DEVICE_OBJECT *device ) { + struct wine_device *wine_device = CONTAINING_RECORD(device, struct wine_device, device_obj); + TRACE("Removing device %p.\n", device); + if (wine_device->children) + { + ULONG i; + for (i = 0; i < wine_device->children->Count; ++i) + remove_device( wine_device->children->Objects[i] ); + } + send_power_irp( device, PowerDeviceD3 ); send_pnp_irp( device, IRP_MN_SURPRISE_REMOVAL ); send_pnp_irp( device, IRP_MN_REMOVE_DEVICE ); } +static BOOL device_in_list( const DEVICE_RELATIONS *list, const DEVICE_OBJECT *device ) +{ + ULONG i; + for (i = 0; i < list->Count; ++i) + { + if (list->Objects[i] == device) + return TRUE; + } + return FALSE; +} + +static void handle_bus_relations( DEVICE_OBJECT *parent ) +{ + struct wine_device *wine_parent = CONTAINING_RECORD(parent, struct wine_device, device_obj); + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + DEVICE_RELATIONS *relations; + IO_STATUS_BLOCK irp_status; + IO_STACK_LOCATION *irpsp; + NTSTATUS status; + HDEVINFO set; + IRP *irp; + ULONG i; + + TRACE( "(%p)\n", parent ); + + set = SetupDiCreateDeviceInfoList( NULL, NULL ); + + parent = IoGetAttachedDevice( parent ); + + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, parent, NULL, 0, NULL, NULL, &irp_status ))) + { + SetupDiDestroyDeviceInfoList( set ); + return; + } + + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->MinorFunction = IRP_MN_QUERY_DEVICE_RELATIONS; + irpsp->Parameters.QueryDeviceRelations.Type = BusRelations; + if ((status = send_device_irp( parent, irp, (ULONG_PTR *)&relations ))) + { + ERR("Failed to enumerate child devices, status %#x.\n", status); + SetupDiDestroyDeviceInfoList( set ); + return; + } + + TRACE("Got %u devices.\n", relations->Count); + + for (i = 0; i < relations->Count; ++i) + { + DEVICE_OBJECT *child = relations->Objects[i]; + + if (!wine_parent->children || !device_in_list( wine_parent->children, child )) + { + TRACE("Adding new device %p.\n", child); + enumerate_new_device( child, set ); + } + } + + ExFreePool( wine_parent->children ); + wine_parent->children = relations; + + SetupDiDestroyDeviceInfoList( set ); +} + /*********************************************************************** * IoInvalidateDeviceRelations (NTOSKRNL.EXE.@) */ diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index de8ddf7ad9..a250878489 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -54,3 +54,4 @@ DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) DECLSP BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; HANDLE driver_key DECLSPEC_HIDDEN; +DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index f0f10ca98e..ad542b5dfb 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -357,7 +357,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * struct platform_private *private = impl_from_DEVICE_OBJECT(device); private->device = IOHIDDevice; private->buffer = NULL; - IoInvalidateDeviceRelations(device, BusRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); } } diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 64c5a8a1d2..5f07ee2435 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -996,7 +996,7 @@ static void try_add_device(unsigned int index) HeapFree(GetProcessHeap(), 0, serial); return; } - IoInvalidateDeviceRelations(device, BusRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); } else { diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 6fa6efb7dc..b2cf62dedb 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1268,7 +1268,7 @@ static void try_add_device(struct udev_device *dev) return; } #endif - IoInvalidateDeviceRelations(device, BusRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); } else { diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ec8e0f7f48..24ddb21c4a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -89,7 +89,8 @@ static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *mouse_obj; /* The root-enumerated device stack. */ -static DEVICE_OBJECT *bus_pdo, *bus_fdo; +DEVICE_OBJECT *bus_pdo; +static DEVICE_OBJECT *bus_fdo; HANDLE driver_key; @@ -560,7 +561,7 @@ static void mouse_device_create(void) mouse_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &wine_mouse_class, &mouse_vtbl, 0); - IoInvalidateDeviceRelations(mouse_obj, BusRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); } static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) @@ -572,6 +573,9 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) switch (irpsp->MinorFunction) { + case IRP_MN_QUERY_DEVICE_RELATIONS: + irp->IoStatus.u.Status = handle_IRP_MN_QUERY_DEVICE_RELATIONS(irp); + break; case IRP_MN_START_DEVICE: mouse_device_create(); @@ -613,11 +617,6 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) switch (irpsp->MinorFunction) { - case IRP_MN_QUERY_DEVICE_RELATIONS: - TRACE("IRP_MN_QUERY_DEVICE_RELATIONS\n"); - status = handle_IRP_MN_QUERY_DEVICE_RELATIONS(irp); - irp->IoStatus.u.Status = status; - break; case IRP_MN_QUERY_ID: TRACE("IRP_MN_QUERY_ID\n"); status = handle_IRP_MN_QUERY_ID(device, irp);

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetViewport().
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: 960a460e37a4677891126979c5a282d55e943d9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=960a460e37a4677891126979… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:22 2019 -0600 d3d9: Handle stateblocks in d3d9_device_SetViewport(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7224c31e6e..b4ba9223e0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2123,7 +2123,9 @@ static HRESULT WINAPI d3d9_device_SetViewport(IDirect3DDevice9Ex *iface, const D vp.max_z = viewport->MaxZ; wined3d_mutex_lock(); - wined3d_device_set_viewports(device->wined3d_device, 1, &vp); + wined3d_stateblock_set_viewport(device->update_state, &vp); + if (!device->recording) + wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK;

1 0