May 2018 - Wine-commits - list.winehq.org

Zebediah Figura : dbghelp: Add a helper to check if a given module is the Wine loader.
by Alexandre Julliard 31 May '18

31 May '18

Module: wine Branch: master Commit: 9b973eee9e06a3dca7a6c5739741446bf46e27f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b973eee9e06a3dca7a6c573… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 31 09:47:48 2018 -0500 dbghelp: Add a helper to check if a given module is the Wine loader. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 9f90d5e..7a23812 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -29,6 +29,7 @@ #include "psapi.h" #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); @@ -75,9 +76,42 @@ static const WCHAR* get_filename(const WCHAR* name, const WCHAR* endptr) return ++ptr; } +static BOOL is_wine_loader(const WCHAR *module) +{ + static const WCHAR wineW[] = {'w','i','n','e',0}; + static const WCHAR suffixW[] = {'6','4',0}; + const WCHAR *filename = get_filename(module, NULL); + const char *ptr, *p; + BOOL ret = FALSE; + WCHAR *buffer; + DWORD len; + + if ((ptr = getenv("WINELOADER"))) + { + if ((p = strrchr(ptr, '/'))) ptr = p + 1; + len = 2 + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); + buffer = heap_alloc( len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, buffer, len ); + } + else + { + buffer = heap_alloc( sizeof(wineW) + 2 * sizeof(WCHAR) ); + strcpyW( buffer, wineW ); + } + + if (!strcmpW( filename, buffer )) + ret = TRUE; + + strcatW( buffer, suffixW ); + if (!strcmpW( filename, buffer )) + ret = TRUE; + + heap_free( buffer ); + return ret; +} + static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) { - const WCHAR *loader = get_wine_loader_name(); const WCHAR *ptr, *endptr; size_t len, l; @@ -87,7 +121,7 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) out[len] = '\0'; if (len > 4 && (l = match_ext(out, len))) out[len - l] = '\0'; - else if (len > strlenW(loader) && !strcmpiW(out + len - strlenW(loader), loader)) + else if (is_wine_loader(out)) lstrcpynW(out, S_WineLoaderW, size); else { @@ -455,8 +489,7 @@ static BOOL module_is_container_loaded(const struct process* pcs, */ enum module_type module_get_type_by_name(const WCHAR* name) { - int loader_len, len = strlenW(name); - const WCHAR *loader; + int len = strlenW(name); /* Skip all version extensions (.[digits]) regex: "(\.\d+)*$" */ do @@ -491,10 +524,7 @@ enum module_type module_get_type_by_name(const WCHAR* name) return DMT_DBG; /* wine is also a native module (Mach-O on Mac OS X, ELF elsewhere) */ - loader = get_wine_loader_name(); - loader_len = strlenW( loader ); - if ((len == loader_len || (len > loader_len && name[len - loader_len - 1] == '/')) && - !strcmpiW(name + len - loader_len, loader)) + if (is_wine_loader(name)) { #ifdef __APPLE__ return DMT_MACHO;

1 0

Zebediah Figura : dbghelp: Determine the wine loader name from the target process's architecture.
by Alexandre Julliard 31 May '18

31 May '18

Module: wine Branch: master Commit: a981edf0bc7c828e6b55fdc73b51a2f457043c4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a981edf0bc7c828e6b55fdc7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 31 09:47:49 2018 -0500 dbghelp: Determine the wine loader name from the target process's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 7 ++++++ dlls/dbghelp/dbghelp_private.h | 4 ++- dlls/dbghelp/elf_module.c | 7 +++++- dlls/dbghelp/macho_module.c | 4 ++- dlls/dbghelp/module.c | 55 +++++++++++++++++++----------------------- 5 files changed, 44 insertions(+), 33 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index a0424aa..0bb591b 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -295,6 +295,7 @@ static BOOL check_live_target(struct process* pcs) BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeProcess) { struct process* pcs; + BOOL wow64, child_wow64; TRACE("(%p %s %u)\n", hProcess, debugstr_w(UserSearchPath), fInvadeProcess); @@ -312,6 +313,12 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP pcs->handle = hProcess; + IsWow64Process(GetCurrentProcess(), &wow64); + + if (!IsWow64Process(hProcess, &child_wow64)) + return FALSE; + pcs->is_64bit = (sizeof(void *) == 8 || wow64) && !child_wow64; + if (UserSearchPath) { pcs->search_path = lstrcpyW(HeapAlloc(GetProcessHeap(), 0, diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index f37991d..3c1b3dd 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -403,6 +403,8 @@ struct process unsigned buffer_size; void* buffer; + + BOOL is_64bit; }; struct line_info @@ -609,7 +611,7 @@ extern void module_reset_debug_info(struct module* module) DECLSPEC_HIDD extern BOOL module_remove(struct process* pcs, struct module* module) DECLSPEC_HIDDEN; extern void module_set_module(struct module* module, const WCHAR* name) DECLSPEC_HIDDEN; -extern const WCHAR *get_wine_loader_name(void) DECLSPEC_HIDDEN; +extern WCHAR * get_wine_loader_name(struct process *pcs) DECLSPEC_HIDDEN; /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e841b1b..4d877b4 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -50,6 +50,7 @@ #include "wine/library.h" #include "wine/debug.h" +#include "wine/heap.h" #ifdef __ELF__ @@ -1568,13 +1569,17 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, */ static BOOL elf_search_loader(struct process* pcs, struct elf_info* elf_info) { + WCHAR *loader = get_wine_loader_name(pcs); PROCESS_BASIC_INFORMATION pbi; ULONG_PTR base = 0; + BOOL ret; if (!NtQueryInformationProcess( pcs->handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL )) ReadProcessMemory( pcs->handle, &pbi.PebBaseAddress->Reserved[0], &base, sizeof(base), NULL ); - return elf_search_and_load_file(pcs, get_wine_loader_name(), base, 0, elf_info); + ret = elf_search_and_load_file(pcs, loader, base, 0, elf_info); + heap_free(loader); + return ret; } /****************************************************************** diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 01fa300..4018c9d 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1703,6 +1703,7 @@ BOOL macho_synchronize_module_list(struct process* pcs) */ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_info) { + WCHAR *loader = get_wine_loader_name(pcs); BOOL ret = FALSE; ULONG_PTR dyld_image_info_address; struct dyld_all_image_infos image_infos; @@ -1757,7 +1758,8 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in } if (!ret) - ret = macho_search_and_load_file(pcs, get_wine_loader_name(), 0, macho_info); + ret = macho_search_and_load_file(pcs, loader, 0, macho_info); + heap_free(loader); return ret; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 7a23812..3659873 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -139,43 +139,38 @@ void module_set_module(struct module* module, const WCHAR* name) module_fill_module(name, module->modulename, sizeof(module->modulename) / sizeof(module->modulename[0])); } -const WCHAR *get_wine_loader_name(void) +/* Returned string must be freed by caller */ +WCHAR *get_wine_loader_name(struct process *pcs) { - static const BOOL is_win64 = sizeof(void *) > sizeof(int); /* FIXME: should depend on target process */ static const WCHAR wineW[] = {'w','i','n','e',0}; static const WCHAR suffixW[] = {'6','4',0}; - static const WCHAR *loader; + WCHAR *buffer, *p; + const char *env; - if (!loader) + /* All binaries are loaded with WINELOADER (if run from tree) or by the + * main executable + */ + if ((env = getenv("WINELOADER"))) + { + DWORD len = 2 + MultiByteToWideChar( CP_UNIXCP, 0, env, -1, NULL, 0 ); + buffer = heap_alloc( len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_UNIXCP, 0, env, -1, buffer, len ); + } + else { - WCHAR *p, *buffer; - const char *ptr; + buffer = heap_alloc( sizeof(wineW) + 2 * sizeof(WCHAR) ); + strcpyW( buffer, wineW ); + } - /* All binaries are loaded with WINELOADER (if run from tree) or by the - * main executable - */ - if ((ptr = getenv("WINELOADER"))) - { - DWORD len = 2 + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); - buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, buffer, len ); - } - else - { - buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(wineW) + 2 * sizeof(WCHAR) ); - strcpyW( buffer, wineW ); - } - p = buffer + strlenW( buffer ) - strlenW( suffixW ); - if (p > buffer && !strcmpW( p, suffixW )) - { - if (!is_win64) *p = 0; - } - else if (is_win64) strcatW( buffer, suffixW ); + p = buffer + strlenW( buffer ) - strlenW( suffixW ); + if (p > buffer && !strcmpW( p, suffixW )) + *p = 0; - TRACE( "returning %s\n", debugstr_w(buffer) ); - loader = buffer; - } - return loader; + if (pcs->is_64bit) + strcatW(buffer, suffixW); + + TRACE( "returning %s\n", debugstr_w(buffer) ); + return buffer; } static const char* get_module_type(enum module_type type, BOOL virtual)

1 0

Zebediah Figura : dbghelp: Correctly determine the wine loader base address.
by Alexandre Julliard 31 May '18

31 May '18

Module: wine Branch: master Commit: 185d9ee7ebf56e0663f715e532f2ee2c27289f12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=185d9ee7ebf56e0663f715e5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 31 09:47:50 2018 -0500 dbghelp: Correctly determine the wine loader base address. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 21 +++++++++++++++++++++ dlls/dbghelp/elf_module.c | 23 +++++++++++++++++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 3c1b3dd..935e766 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -542,6 +542,27 @@ struct cpu extern struct cpu* dbghelp_current_cpu DECLSPEC_HIDDEN; +/* Abbreviated 32-bit PEB */ +typedef struct _PEB32 +{ + BOOLEAN InheritedAddressSpace; + BOOLEAN ReadImageFileExecOptions; + BOOLEAN BeingDebugged; + BOOLEAN SpareBool; + DWORD Mutant; + DWORD ImageBaseAddress; + DWORD LdrData; + DWORD ProcessParameters; + DWORD SubSystemData; + DWORD ProcessHeap; + DWORD FastPebLock; + DWORD FastPebLockRoutine; + DWORD FastPebUnlockRoutine; + ULONG EnvironmentUpdateCount; + DWORD KernelCallbackTable; + ULONG Reserved[2]; +} PEB32; + /* dbghelp.c */ extern struct process* process_find_by_handle(HANDLE hProcess) DECLSPEC_HIDDEN; extern BOOL validate_addr64(DWORD64 addr) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 4d877b4..e047a7f 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1574,8 +1574,27 @@ static BOOL elf_search_loader(struct process* pcs, struct elf_info* elf_info) ULONG_PTR base = 0; BOOL ret; - if (!NtQueryInformationProcess( pcs->handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL )) - ReadProcessMemory( pcs->handle, &pbi.PebBaseAddress->Reserved[0], &base, sizeof(base), NULL ); + if (NtQueryInformationProcess( pcs->handle, ProcessBasicInformation, + &pbi, sizeof(pbi), NULL )) + return FALSE; + + if (!pcs->is_64bit) + { + PEB32 *peb32 = (PEB32 *)pbi.PebBaseAddress; + DWORD base32; + + if (!ReadProcessMemory( pcs->handle, &peb32->Reserved[0], &base32, + sizeof(base32), NULL )) + return FALSE; + + base = base32; + } + else + { + if (!ReadProcessMemory( pcs->handle, &pbi.PebBaseAddress->Reserved[0], + &base, sizeof(base), NULL )) + return FALSE; + } ret = elf_search_and_load_file(pcs, loader, base, 0, elf_info); heap_free(loader);

1 0

Michael Stefaniuc : d3dx10/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 31 May '18

31 May '18

Module: wine Branch: master Commit: c64185214f8dae75c8734d1817fbad5b85f70c98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c64185214f8dae75c8734d18… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:27 2018 +0200 d3dx10/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 9c84a76..2bf92cd 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -269,8 +269,8 @@ float4 main(float4 color : COLOR) : SV_TARGET hr = ID3D10Device_CreatePixelShader(device, simple_ps, sizeof(simple_ps), &ps); ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); - hr = ID3D10Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), - simple_vs, sizeof(simple_vs), &input_layout); + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), simple_vs, + sizeof(simple_vs), &input_layout); ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); blend_desc.AlphaToCoverageEnable = FALSE;

1 0

Michael Stefaniuc : xaudio2/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 31 May '18

31 May '18

Module: wine Branch: master Commit: 8226f877d98135d3f03825fe6d083130ebb5f393 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8226f877d98135d3f03825fe… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:33 2018 +0200 xaudio2/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index ccc415a..6609753 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1004,7 +1004,7 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) } if(pCreateFX){ - for(i = 0; i < sizeof(const_clsids) / sizeof(*const_clsids); ++i){ + for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ hr = pCreateFX(const_clsids[i].clsid, &fx_unk); todo_wine_if(const_clsids[i].todo) ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); @@ -1090,7 +1090,7 @@ static void test_xapo_creation_modern(const char *module) } if(pCreateFX){ - for(i = 0; i < sizeof(const_clsids) / sizeof(*const_clsids); ++i){ + for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ hr = pCreateFX(const_clsids[i].clsid, &fx_unk, NULL, 0); todo_wine_if(const_clsids[i].todo) ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr);

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetMostRecentRunTime().
by Alexandre Julliard 31 May '18

31 May '18

Module: wine Branch: master Commit: 5f895673dfa80e4a34fd7c65f5e3505888f4a7f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f895673dfa80e4a34fd7c65… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 31 12:20:14 2018 +0800 mstask: Implement ITask::GetMostRecentRunTime(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 58be83e..91d2cb6 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -63,6 +63,7 @@ typedef struct HRESULT status; WORD idle_minutes, deadline_minutes; DWORD flags, priority, maxRunTime, exit_code; + SYSTEMTIME last_runtime; LPWSTR accountName; DWORD trigger_count; TASK_TRIGGER *trigger; @@ -654,10 +655,18 @@ static HRESULT WINAPI MSTASK_ITask_EditWorkItem( static HRESULT WINAPI MSTASK_ITask_GetMostRecentRunTime(ITask *iface, SYSTEMTIME *st) { - FIXME("(%p, %p): stub\n", iface, st); + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p)\n", iface, st); + + if (This->status == SCHED_S_TASK_NOT_SCHEDULED) + { + memset(st, 0, sizeof(*st)); + return SCHED_S_TASK_HAS_NOT_RUN; + } - memset(st, 0, sizeof(*st)); - return SCHED_S_TASK_HAS_NOT_RUN; + *st = This->last_runtime; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) @@ -1262,8 +1271,9 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) This->status = fixed->status; TRACE("flags %08x\n", fixed->flags); This->flags = fixed->flags; + This->last_runtime = fixed->last_runtime; st = &fixed->last_runtime; - TRACE("last_runtime %d/%d/%d wday %d %d:%d:%d.%03d\n", + TRACE("last_runtime %u/%u/%u wday %u %u:%02u:%02u.%03u\n", st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); @@ -1617,7 +1627,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta This->status = SCHED_S_TASK_HAS_NOT_RUN; fixed.status = This->status; fixed.flags = This->flags; - memset(&fixed.last_runtime, 0, sizeof(fixed.last_runtime)); + fixed.last_runtime = This->last_runtime; try = 1; for (;;) @@ -1855,6 +1865,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->is_dirty = FALSE; This->instance_count = 0; + memset(&This->last_runtime, 0, sizeof(This->last_runtime)); CoCreateGuid(&This->uuid); /* Default time is 3 days = 259200000 ms */

1 0

Dmitry Timoshkov : schedsvc: Read parameters and current directory from the job file.
by Alexandre Julliard 31 May '18

31 May '18

Module: wine Branch: master Commit: bfb0474e77b03be7dad9dbd18f804a47a63dc868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfb0474e77b03be7dad9dbd1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 31 12:20:46 2018 +0800 schedsvc: Read parameters and current directory from the job file. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 542dfc3..05335de 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -59,6 +59,8 @@ struct job_t { struct list entry; WCHAR *name; + WCHAR *params; + WCHAR *curdir; AT_ENUM info; FIXDLEN_DATA data; USHORT instance_count; @@ -76,7 +78,7 @@ static CRITICAL_SECTION_DEBUG cs_debug = }; static CRITICAL_SECTION at_job_list_section = { &cs_debug, -1, 0, 0, 0, 0 }; -static DWORD load_unicode_strings(const char *data, DWORD limit, AT_ENUM *info) +static DWORD load_unicode_strings(const char *data, DWORD limit, struct job_t *job) { DWORD i, data_size = 0; USHORT len; @@ -101,8 +103,23 @@ static DWORD load_unicode_strings(const char *data, DWORD limit, AT_ENUM *info) TRACE("string %u: %s\n", i, wine_dbgstr_wn((const WCHAR *)data, len)); - if (i == 0) - info->Command = heap_strdupW((const WCHAR *)data); + switch (i) + { + case 0: + job->info.Command = heap_strdupW((const WCHAR *)data); + break; + + case 1: + job->params = heap_strdupW((const WCHAR *)data); + break; + + case 2: + job->curdir = heap_strdupW((const WCHAR *)data); + break; + + default: + break; + } data += len * sizeof(WCHAR); data_size += len * sizeof(WCHAR); @@ -162,7 +179,7 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) TRACE("instance count %u\n", info->instance_count); if (fixed->name_size_offset + sizeof(USHORT) < size) - unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, &info->info); + unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, info); else { TRACE("invalid name_size_offset\n"); @@ -324,6 +341,8 @@ static void free_job(struct job_t *job) { free_job_info(&job->info); heap_free(job->name); + heap_free(job->params); + heap_free(job->curdir); heap_free(job); }

1 0

Dmitry Timoshkov : mstask: Retry with a timeout if opening a job file has failed.
by Alexandre Julliard 31 May '18

31 May '18

Module: wine Branch: master Commit: 5c85a243109e61ec6751c09f03899c0103012d92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c85a243109e61ec6751c09f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 31 12:21:05 2018 +0800 mstask: Retry with a timeout if opening a job file has failed. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 91d2cb6..266029a 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1398,7 +1398,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi TaskImpl *This = impl_from_IPersistFile(iface); HRESULT hr; HANDLE file, mapping; - DWORD access, sharing, size; + DWORD access, sharing, size, try; void *data; TRACE("(%p, %s, 0x%08x)\n", iface, debugstr_w(file_name), mode); @@ -1432,11 +1432,18 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi break; } - file = CreateFileW(file_name, access, sharing, NULL, OPEN_EXISTING, 0, 0); - if (file == INVALID_HANDLE_VALUE) + try = 1; + for (;;) { - TRACE("Failed to open %s, error %u\n", debugstr_w(file_name), GetLastError()); - return HRESULT_FROM_WIN32(GetLastError()); + file = CreateFileW(file_name, access, sharing, NULL, OPEN_EXISTING, 0, 0); + if (file != INVALID_HANDLE_VALUE) break; + + if (try++ >= 3) + { + TRACE("Failed to open %s, error %u\n", debugstr_w(file_name), GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + Sleep(100); } size = GetFileSize(file, NULL);

1 0

Dmitry Timoshkov : schedsvc: Add support for executing tasks.
by Alexandre Julliard 31 May '18

31 May '18

Module: wine Branch: master Commit: 8d0444826d5064c46b1dd64276b701f5e3cb89d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d0444826d5064c46b1dd642… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 31 12:21:34 2018 +0800 schedsvc: Add support for executing tasks. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 182 ++++++++++++++++++++++++++++++++++++--- dlls/schedsvc/schedsvc_private.h | 3 + dlls/schedsvc/svc_main.c | 60 ++++++++++++- 3 files changed, 230 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d0444826d5064c46b1d…

1 0

Huw Davies : dplayx: Prevent out-of-bounds access to lpMemArea.
by Alexandre Julliard 31 May '18

31 May '18

Module: wine Branch: master Commit: 18e532d6452e45772c0d435bfefd1fbf68442e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18e532d6452e45772c0d435b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 30 13:01:56 2018 +0100 dplayx: Prevent out-of-bounds access to lpMemArea. Based on a patch by Andrey Gusev. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplayx_global.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 14c53a0..bc087c8 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -120,9 +120,9 @@ static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size ) /* Find blank area */ uBlockUsed = 0; - while( lpMemArea[ uBlockUsed ].used && uBlockUsed <= dwMaxBlock ) { uBlockUsed++; } + while( uBlockUsed < dwMaxBlock && lpMemArea[ uBlockUsed ].used ) { uBlockUsed++; } - if( uBlockUsed <= dwMaxBlock ) + if( uBlockUsed < dwMaxBlock ) { /* Set the area used */ lpMemArea[ uBlockUsed ].used = TRUE;

1 0