- wine-devel - winehq.org

[PATCH] testbot: Fix handling of test unit additions/removals in patch series.
by Francois Gouget 31 May '18

31 May '18

The TestBot used to only analyse the last patch in the series to determine whether it impacts the tests or not. However patches to resource files and helper dlls require having an up-to-date list of the test units, and that list may be impacted by previous patches in the series. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 19 +++++++++++++++++-- testbot/lib/WineTestBot/Patches.pm | 4 +++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index a466df359..611d883e4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -127,9 +127,9 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpact($;$) +sub GetPatchImpact($;$$) { - my ($PatchFileName, $NoUnits) = @_; + my ($PatchFileName, $NoUnits, $PastImpacts) = @_; my $fh; return undef if (!open($fh, "<", $PatchFileName)); @@ -138,6 +138,21 @@ sub GetPatchImpact($;$) NoUnits => $NoUnits, Tests => {}, }; + + if ($PastImpacts) + { + foreach my $PastInfo (values %{$PastImpacts->{Tests}}) + { + if ($PastInfo->{Files}) + { + foreach my $File (keys %{$PastInfo->{Files}}) + { + _AddTest($Impacts, "$PastInfo->{Path}/$File", + $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); + } + } + } + } my ($Path, $Change); while (my $Line = <$fh>) { diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d4a5e0b17..71d735b08 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -132,7 +132,9 @@ sub Submit($$$) { my ($self, $PatchFileName, $IsSet) = @_; - my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id); + my $PastImpacts; + $PastImpacts = GetPatchImpact($PatchFileName) if ($IsSet); + my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); if (!$Impacts->{UnitCount}) { $self->Disposition(($IsSet ? "Set" : "Patch") . -- 2.17.0

1 0

[PATCH] testbot/build: Tell Wine not to rebuild the WineTest executable.
by Francois Gouget 31 May '18

31 May '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Reconfig.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 322638eb1..6f461144e 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -148,7 +148,7 @@ sub BuildNative() # Rebuild from scratch to make sure cruft will not accumulate system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . - " time ../wine/configure --enable-win64 --without-x --without-freetype && " . + " time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -171,8 +171,8 @@ sub BuildCross($) # Rebuild from scratch to make sure cruft will not accumulate system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . - " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . - " time make -j$ncpus programs/winetest " . + " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && " . + " time make -j$ncpus buildtests" . ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) { -- 2.17.0

1 0

[PATCH] testbot: Fix the "Set doesn't affect tests" message.
by Francois Gouget 31 May '18

31 May '18

There is no need to rerun the tests for part N of a patch set if it does not impact the tests: the results would be the same as those already obtained from the combined part 1 .. part N patch. So adjust the message to better convey this. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 71d735b08..d5be1b355 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -137,7 +137,7 @@ sub Submit($$$) my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); if (!$Impacts->{UnitCount}) { - $self->Disposition(($IsSet ? "Set" : "Patch") . + $self->Disposition(($IsSet ? "Part" : "Patch") . " doesn't affect tests"); return undef; } -- 2.17.0

1 0

[PATCH] dplayx: Prevent out-of-bounds access to lpMemArea.
by Huw Davies 31 May '18

31 May '18

Based on a patch by Andrey Gusev. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 14c53a0c8d..bc087c8b33 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; -- 2.16.2

2 1

[PATCH 4/4] schedsvc: Add support for executing tasks.
by Dmitry Timoshkov 31 May '18

31 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 05335de3f3..9497c900a7 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -66,9 +66,19 @@ struct job_t USHORT instance_count; }; +struct running_job_t +{ + struct list entry; + UUID uuid; + HANDLE process; + DWORD pid; +}; + static LONG current_jobid = 1; static struct list at_job_list = LIST_INIT(at_job_list); +static struct list running_job_list = LIST_INIT(running_job_list); + static CRITICAL_SECTION at_job_list_section; static CRITICAL_SECTION_DEBUG cs_debug = { @@ -359,11 +369,6 @@ void add_job(const WCHAR *name) return; } - if (job->data.flags & 0x08000000) - FIXME("Terminate(%s): not implemented\n", debugstr_w(job->info.Command)); - else if (job->data.flags & 0x04000000) - FIXME("Run(%s): not implemented\n", debugstr_w(job->info.Command)); - EnterCriticalSection(&at_job_list_section); job->name = heap_strdupW(name); job->info.JobId = current_jobid++; @@ -545,25 +550,180 @@ failed: return ret; } -static struct job_t *find_job(DWORD jobid, const WCHAR *name) +static struct job_t *find_job(DWORD jobid, const WCHAR *name, const UUID *id) { struct job_t *job; LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) { - if ((name && !lstrcmpiW(job->name, name)) || job->info.JobId == jobid) + if (job->info.JobId == jobid || (name && !lstrcmpiW(job->name, name)) || (id && IsEqualGUID(&job->data.uuid, id))) return job; } return NULL; } +static void update_job_status(struct job_t *job) +{ + HANDLE hfile; + DWORD try, size; +#include "pshpack2.h" + struct + { + UINT exit_code; + UINT status; + UINT flags; + SYSTEMTIME last_runtime; + WORD instance_count; + } state; +#include "poppack.h" + + try = 1; + for (;;) + { + hfile = CreateFileW(job->name, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (hfile != INVALID_HANDLE_VALUE) break; + + if (try++ >= 3) + { + ERR("Failed to update %s, error %u\n", debugstr_w(job->name), GetLastError()); + return; + } + Sleep(100); + } + + if (SetFilePointer(hfile, FIELD_OFFSET(FIXDLEN_DATA, exit_code), NULL, FILE_BEGIN) != INVALID_SET_FILE_POINTER) + { + state.exit_code = job->data.exit_code; + state.status = job->data.status; + state.flags = job->data.flags; + state.last_runtime = job->data.last_runtime; + state.instance_count = job->instance_count; + WriteFile(hfile, &state, sizeof(state), &size, NULL); + } + + CloseHandle(hfile); +} + +void update_process_status(DWORD pid) +{ + struct running_job_t *runjob; + + EnterCriticalSection(&at_job_list_section); + + LIST_FOR_EACH_ENTRY(runjob, &running_job_list, struct running_job_t, entry) + { + if (runjob->pid == pid) + { + struct job_t *job = find_job(0, NULL, &runjob->uuid); + if (job) + { + DWORD exit_code = STILL_ACTIVE; + + GetExitCodeProcess(runjob->process, &exit_code); + + if (exit_code != STILL_ACTIVE) + { + CloseHandle(runjob->process); + list_remove(&runjob->entry); + heap_free(runjob); + + job->data.exit_code = exit_code; + job->data.status = SCHED_S_TASK_TERMINATED; + job->data.flags &= ~0x0c000000; + job->instance_count = 0; + update_job_status(job); + } + } + break; + } + } + + LeaveCriticalSection(&at_job_list_section); +} + +void check_task_state(void) +{ + struct job_t *job; + struct running_job_t *runjob; + + EnterCriticalSection(&at_job_list_section); + + LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) + { + if (job->data.flags & 0x08000000) + { + TRACE("terminating process %s\n", debugstr_w(job->info.Command)); + + LIST_FOR_EACH_ENTRY(runjob, &running_job_list, struct running_job_t, entry) + { + if (IsEqualGUID(&job->data.uuid, &runjob->uuid)) + { + TerminateProcess(runjob->process, 0); + update_process_status(runjob->pid); + break; + } + } + } + else if (job->data.flags & 0x04000000) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + TRACE("running process %s\n", debugstr_w(job->info.Command)); + + if (job->instance_count) + FIXME("process %s is already running\n", debugstr_w(job->info.Command)); + + runjob = heap_alloc(sizeof(*runjob)); + if (runjob) + { + static WCHAR winsta0[] = { 'W','i','n','S','t','a','0',0 }; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + /* FIXME: if (job->data.flags & TASK_FLAG_INTERACTIVE) */ + si.lpDesktop = winsta0; + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_SHOWNORMAL; + TRACE("executing %s %s at %s\n", debugstr_w(job->info.Command), debugstr_w(job->params), debugstr_w(job->curdir)); + if (CreateProcessW(job->info.Command, job->params, NULL, NULL, FALSE, 0, NULL, job->curdir, &si, &pi)) + { + CloseHandle(pi.hThread); + + GetLocalTime(&job->data.last_runtime); + job->data.exit_code = 0; + job->data.status = SCHED_S_TASK_RUNNING; + job->instance_count = 1; + + runjob->uuid = job->data.uuid; + runjob->process = pi.hProcess; + runjob->pid = pi.dwProcessId; + list_add_tail(&running_job_list, &runjob->entry); + add_process_to_queue(pi.hProcess); + } + else + { + WARN("failed to execute %s\n", debugstr_w(job->info.Command)); + job->data.status = SCHED_S_TASK_HAS_NOT_RUN; + job->instance_count = 0; + } + } + + job->data.flags &= ~0x0c000000; + update_job_status(job); + } + } + + LeaveCriticalSection(&at_job_list_section); +} + void remove_job(const WCHAR *name) { struct job_t *job; EnterCriticalSection(&at_job_list_section); - job = find_job(0, name); + job = find_job(0, name, NULL); if (job) { list_remove(&job->entry); @@ -596,7 +756,7 @@ DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) for (i = 0; i < 5; i++) { EnterCriticalSection(&at_job_list_section); - job = find_job(0, task_name); + job = find_job(0, task_name, NULL); LeaveCriticalSection(&at_job_list_section); if (job) @@ -640,7 +800,7 @@ DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jo for (jobid = min_jobid; jobid <= max_jobid; jobid++) { - struct job_t *job = find_job(jobid, NULL); + struct job_t *job = find_job(jobid, NULL, NULL); if (!job) { @@ -735,7 +895,7 @@ DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **in EnterCriticalSection(&at_job_list_section); - job = find_job(jobid, NULL); + job = find_job(jobid, NULL, NULL); if (job) { AT_INFO *info_ret = heap_alloc(sizeof(*info_ret)); diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 215bba003e..f5cec2a7cb 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -25,6 +25,9 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; void add_job(const WCHAR *name) DECLSPEC_HIDDEN; void remove_job(const WCHAR *name) DECLSPEC_HIDDEN; +void check_task_state(void) DECLSPEC_HIDDEN; +void add_process_to_queue(HANDLE hproc) DECLSPEC_HIDDEN; +void update_process_status(DWORD pid) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index f021d63b98..9342b50e4b 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -34,13 +34,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); static const WCHAR scheduleW[] = {'S','c','h','e','d','u','l','e',0}; static SERVICE_STATUS_HANDLE schedsvc_handle; -static HANDLE done_event; +static HANDLE done_event, hjob_queue; + +void add_process_to_queue(HANDLE process) +{ + if (!AssignProcessToJobObject(hjob_queue, process)) + ERR("AssignProcessToJobObject failed"); +} static DWORD WINAPI tasks_monitor_thread(void *arg) { static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; WCHAR path[MAX_PATH]; - HANDLE htasks; + HANDLE htasks, hport; + JOBOBJECT_ASSOCIATE_COMPLETION_PORT info; OVERLAPPED ov; TRACE("Starting...\n"); @@ -59,6 +66,28 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) return -1; } + hjob_queue = CreateJobObjectW(NULL, NULL); + if (!hjob_queue) + { + ERR("CreateJobObject failed"); + return -1; + } + + hport = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 1); + if (!hport) + { + ERR("CreateIoCompletionPort failed"); + return -1; + } + + info.CompletionKey = hjob_queue; + info.CompletionPort = hport; + if (!SetInformationJobObject(hjob_queue, JobObjectAssociateCompletionPortInformation, &info, sizeof(info))) + { + ERR("SetInformationJobObject failed"); + return -1; + } + memset(&ov, 0, sizeof(ov)); ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -69,7 +98,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) FILE_NOTIFY_INFORMATION data; WCHAR name_buffer[MAX_PATH]; } info; - HANDLE events[2]; + HANDLE events[3]; DWORD ret; /* the buffer must be DWORD aligned */ @@ -87,10 +116,29 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) events[0] = done_event; events[1] = ov.hEvent; + events[2] = hport; - ret = WaitForMultipleObjects(2, events, FALSE, INFINITE); + ret = WaitForMultipleObjects(3, events, FALSE, INFINITE); if (ret == WAIT_OBJECT_0) break; + if (ret == WAIT_OBJECT_0 + 2) + { + DWORD msg; + ULONG_PTR dummy, pid; + + if (GetQueuedCompletionStatus(hport, &msg, &dummy, (OVERLAPPED **)&pid, 0)) + { + if (msg == JOB_OBJECT_MSG_EXIT_PROCESS) + { + TRACE("got message: process %#lx has terminated\n", pid); + update_process_status(pid); + } + else + FIXME("got message %#x from the job\n", msg); + } + continue; + } + info.data.FileName[info.data.FileNameLength/sizeof(WCHAR)] = 0; switch (info.data.Action) @@ -126,9 +174,13 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) FIXME("%s: action %#x not handled\n", debugstr_w(info.data.FileName), info.data.Action); break; } + + check_task_state(); } CloseHandle(ov.hEvent); + CloseHandle(hport); + CloseHandle(hjob_queue); CloseHandle(htasks); TRACE("Finished.\n"); -- 2.16.3

1 0

[PATCH 3/4] mstask: Retry with a timeout if opening a job file has failed.
by Dmitry Timoshkov 31 May '18

31 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 91d2cb6209..266029a58e 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); -- 2.16.3

1 0

[PATCH 2/4] schedsvc: Read parameters and current directory from the job file.
by Dmitry Timoshkov 31 May '18

31 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 542dfc3701..05335de3f3 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); } -- 2.16.3

1 0

[PATCH 1/4] mstask: Implement ITask::GetMostRecentRunTime().
by Dmitry Timoshkov 31 May '18

31 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 58be83ecb6..91d2cb6209 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 */ -- 2.16.3

1 0

[PATCH 1/3] include: Add virtdisk.h.
by Gijs Vermeulen 31 May '18

31 May '18

Based on a patch by Louis Lenders. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- This patchset fixes: https://bugs.winehq.org/show_bug.cgi?id=42577 include/Makefile.in | 1 + include/virtdisk.h | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 201 insertions(+) create mode 100644 include/virtdisk.h diff --git a/include/Makefile.in b/include/Makefile.in index 78ab095d77..900e326653 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -631,6 +631,7 @@ SOURCES = \ verrsrc.h \ vfw.h \ vfwmsgs.h \ + virtdisk.h \ vmr9.idl \ vmrender.idl \ vss.idl \ diff --git a/include/virtdisk.h b/include/virtdisk.h new file mode 100644 index 0000000000..0e79bf8b2d --- /dev/null +++ b/include/virtdisk.h @@ -0,0 +1,200 @@ +/* + * Copyright 2017 Louis Lenders + * Copyright 2018 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_VIRTDISK_DLL_H +#define __WINE_VIRTDISK_DLL_H + +#include <windows.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#define VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN 0 +#define VIRTUAL_STORAGE_TYPE_DEVICE_ISO 1 +#define VIRTUAL_STORAGE_TYPE_DEVICE_VHD 2 + +typedef enum _ATTACH_VIRTUAL_DISK_FLAG { + ATTACH_VIRTUAL_DISK_FLAG_NONE = 0x00000000, + ATTACH_VIRTUAL_DISK_FLAG_READ_ONLY = 0x00000001, + ATTACH_VIRTUAL_DISK_FLAG_NO_DRIVE_LETTER = 0x00000002, + ATTACH_VIRTUAL_DISK_FLAG_PERMANENT_LIFETIME = 0x00000004, + ATTACH_VIRTUAL_DISK_FLAG_NO_LOCAL_HOST = 0x00000008 +} ATTACH_VIRTUAL_DISK_FLAG; + +typedef enum _ATTACH_VIRTUAL_DISK_VERSION { + ATTACH_VIRTUAL_DISK_VERSION_UNSPECIFIED = 0, + ATTACH_VIRTUAL_DISK_VERSION_1 = 1 +} ATTACH_VIRTUAL_DISK_VERSION; + +typedef enum _COMPACT_VIRTUAL_DISK_FLAG { + COMPACT_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} COMPACT_VIRTUAL_DISK_FLAG; + +typedef enum _COMPACT_VIRTUAL_DISK_VERSION { + COMPACT_VIRTUAL_DISK_VERSION_UNSPECIFIED = 0, + COMPACT_VIRTUAL_DISK_VERSION_1 = 1 +} COMPACT_VIRTUAL_DISK_VERSION; + +typedef enum _DEPENDENT_DISK_FLAG +{ + DEPENDENT_DISK_FLAG_NONE = 0x00000000, + DEPENDENT_DISK_FLAG_MULT_BACKING_FILES = 0x00000001, + DEPENDENT_DISK_FLAG_FULLY_ALLOCATED = 0x00000002, + DEPENDENT_DISK_FLAG_READ_ONLY = 0x00000004, + DEPENDENT_DISK_FLAG_REMOTE = 0x00000008, + DEPENDENT_DISK_FLAG_SYSTEM_VOLUME = 0x00000010, + DEPENDENT_DISK_FLAG_SYSTEM_VOLUME_PARENT = 0x00000020, + DEPENDENT_DISK_FLAG_REMOVABLE = 0x00000040, + DEPENDENT_DISK_FLAG_NO_DRIVE_LETTER = 0x00000080, + DEPENDENT_DISK_FLAG_PARENT = 0x00000100, + DEPENDENT_DISK_FLAG_NO_HOST_DISK = 0x00000200, + DEPENDENT_DISK_FLAG_PERMANENT_LIFETIME = 0x00000400 +} DEPENDENT_DISK_FLAG; + +typedef enum _EXPAND_VIRTUAL_DISK_VERSION { + EXPAND_VIRTUAL_DISK_VERSION_UNSPECIFIED = 0, + EXPAND_VIRTUAL_DISK_VERSION_1 = 1 +} EXPAND_VIRTUAL_DISK_VERSION; + +typedef enum _DETACH_VIRTUAL_DISK_FLAG { + DETACH_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} DETACH_VIRTUAL_DISK_FLAG; + +typedef enum _EXPAND_VIRTUAL_DISK_FLAG { + EXPAND_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} EXPAND_VIRTUAL_DISK_FLAG; + +typedef enum _GET_STORAGE_DEPENDENCY_FLAG +{ + GET_STORAGE_DEPENDENCY_FLAG_NONE = 0x00000000, + GET_STORAGE_DEPENDENCY_FLAG_HOST_VOLUMES = 0x00000001, + GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE = 0x00000002 +} GET_STORAGE_DEPENDENCY_FLAG; + +typedef enum _MIRROR_VIRTUAL_DISK_FLAG { + MIRROR_VIRTUAL_DISK_FLAG_NONE = 0x00000000, + MIRROR_VIRTUAL_DISK_FLAG_EXISTING_FILE = 0x00000001 +} MIRROR_VIRTUAL_DISK_FLAG; + +typedef enum _MIRROR_VIRTUAL_DISK_VERSION { + MIRROR_VIRTUAL_DISK_VERSION_UNSPECIFIED = 0, + MIRROR_VIRTUAL_DISK_VERSION_1 = 1 +} MIRROR_VIRTUAL_DISK_VERSION; + +typedef enum _MERGE_VIRTUAL_DISK_FLAG { + MERGE_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} MERGE_VIRTUAL_DISK_FLAG; + +typedef enum _STORAGE_DEPENDENCY_INFO_VERSION +{ + STORAGE_DEPENDENCY_INFO_VERSION_UNSPECIFIED = 0x0, + STORAGE_DEPENDENCY_INFO_VERSION_1 = 0x1, + STORAGE_DEPENDENCY_INFO_VERSION_2 = 0x2 +} STORAGE_DEPENDENCY_INFO_VERSION; + +typedef enum _VIRTUAL_DISK_ACCESS_MASK { + VIRTUAL_DISK_ACCESS_NONE = 0x00000000, + VIRTUAL_DISK_ACCESS_ATTACH_RO = 0x00010000, + VIRTUAL_DISK_ACCESS_ATTACH_RW = 0x00020000, + VIRTUAL_DISK_ACCESS_DETACH = 0x00040000, + VIRTUAL_DISK_ACCESS_GET_INFO = 0x00080000, + VIRTUAL_DISK_ACCESS_CREATE = 0x00100000, + VIRTUAL_DISK_ACCESS_METAOPS = 0x00200000, + VIRTUAL_DISK_ACCESS_READ = 0x000d0000, + VIRTUAL_DISK_ACCESS_ALL = 0x003f0000, + VIRTUAL_DISK_ACCESS_WRITABLE = 0x00320000 +} VIRTUAL_DISK_ACCESS_MASK; + +typedef struct _VIRTUAL_STORAGE_TYPE +{ + ULONG DeviceId; + GUID VendorId; +} VIRTUAL_STORAGE_TYPE, *PVIRTUAL_STORAGE_TYPE; + +typedef struct _ATTACH_VIRTUAL_DISK_PARAMETERS { + ATTACH_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG Reserved; + } Version1; + } DUMMYUNIONNAME; +} ATTACH_VIRTUAL_DISK_PARAMETERS, *PATTACH_VIRTUAL_DISK_PARAMETERS; + +typedef struct _COMPACT_VIRTUAL_DISK_PARAMETERS { + COMPACT_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG Reserved; + } Version1; + } DUMMYUNIONNAME; +} COMPACT_VIRTUAL_DISK_PARAMETERS, *PCOMPACT_VIRTUAL_DISK_PARAMETERS; + +typedef struct _EXPAND_VIRTUAL_DISK_PARAMETERS { + EXPAND_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONGLONG NewSize; + } Version1; + } DUMMYUNIONNAME; +} EXPAND_VIRTUAL_DISK_PARAMETERS, *PEXPAND_VIRTUAL_DISK_PARAMETERS; + +typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_1 +{ + DEPENDENT_DISK_FLAG DependencyTypeFlags; + ULONG ProviderSpecificFlags; + VIRTUAL_STORAGE_TYPE VirtualStorageType; +} STORAGE_DEPENDENCY_INFO_TYPE_1, *PSTORAGE_DEPENDENCY_INFO_TYPE_1; + +typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_2 +{ + DEPENDENT_DISK_FLAG DependencyTypeFlags; + ULONG ProviderSpecificFlags; + VIRTUAL_STORAGE_TYPE VirtualStorageType; + ULONG AncestorLevel; + PWSTR DependencyDeviceName; + PWSTR HostVolumeName; + PWSTR DependentVolumeName; + PWSTR DependentVolumeRelativePath; +} STORAGE_DEPENDENCY_INFO_TYPE_2, *PSTORAGE_DEPENDENCY_INFO_TYPE_2; + +typedef struct _STORAGE_DEPENDENCY_INFO +{ + STORAGE_DEPENDENCY_INFO_VERSION Version; + ULONG NumberEntries; + __C89_NAMELESS union + { + STORAGE_DEPENDENCY_INFO_TYPE_1 Version1Entries[1]; + STORAGE_DEPENDENCY_INFO_TYPE_2 Version2Entries[1]; + } __C89_NAMELESSUNIONNAME; +} STORAGE_DEPENDENCY_INFO, *PSTORAGE_DEPENDENCY_INFO; + +typedef struct _VIRTUAL_DISK_PROGRESS { + DWORD OperationStatus; + ULONGLONG CurrentValue; + ULONGLONG CompletionValue; +} VIRTUAL_DISK_PROGRESS, *PVIRTUAL_DISK_PROGRESS; + +DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_VIRTDISK_DLL_H */ -- 2.13.6

4 8

[PATCH 15/17] scrrun/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/tests/dictionary.c | 6 +++--- dlls/scrrun/tests/filesystem.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 658dd66086..cda288b1bb 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -368,7 +368,7 @@ static void test_hash_value(void) ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == 0, "got %d\n", V_I4(&hash)); - for (i = 0; i < sizeof(str_hash_tests)/sizeof(str_hash_tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(str_hash_tests); i++) { expected = get_str_hash(str_hash_tests[i], BinaryCompare); hr = IDictionary_put_CompareMode(dict, BinaryCompare); @@ -461,7 +461,7 @@ static void test_hash_value(void) ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); - for (i = 0; i < sizeof(int_hash_tests)/sizeof(int_hash_tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(int_hash_tests); i++) { SHORT i2; BYTE ui1; LONG i4; @@ -597,7 +597,7 @@ static void test_hash_value(void) ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == 0, "got hash 0x%08x\n", V_I4(&hash)); - for (i = 0; i < sizeof(float_hash_tests)/sizeof(float_hash_tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(float_hash_tests); i++) { double dbl; FLOAT flt; DATE date; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index d0c448c085..29ee73f243 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -375,7 +375,7 @@ static void test_GetFileVersion(void) BSTR path, version; HRESULT hr; - GetSystemDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW)); lstrcpyW(filenameW, pathW); lstrcatW(filenameW, k32W); @@ -438,7 +438,7 @@ static void test_GetParentFolderName(void) hr = IFileSystem3_GetParentFolderName(fs3, NULL, NULL); ok(hr == E_POINTER, "GetParentFolderName returned %x, expected E_POINTER\n", hr); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i < ARRAY_SIZE(tests); i++) { result = (BSTR)0xdeadbeef; path = tests[i].path ? SysAllocString(tests[i].path) : NULL; hr = IFileSystem3_GetParentFolderName(fs3, path, &result); @@ -481,7 +481,7 @@ static void test_GetFileName(void) hr = IFileSystem3_GetFileName(fs3, NULL, NULL); ok(hr == E_POINTER, "GetFileName returned %x, expected E_POINTER\n", hr); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i < ARRAY_SIZE(tests); i++) { result = (BSTR)0xdeadbeef; path = tests[i].path ? SysAllocString(tests[i].path) : NULL; hr = IFileSystem3_GetFileName(fs3, path, &result); @@ -527,7 +527,7 @@ static void test_GetBaseName(void) hr = IFileSystem3_GetBaseName(fs3, NULL, NULL); ok(hr == E_POINTER, "GetBaseName returned %x, expected E_POINTER\n", hr); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i < ARRAY_SIZE(tests); i++) { result = (BSTR)0xdeadbeef; path = tests[i].path ? SysAllocString(tests[i].path) : NULL; hr = IFileSystem3_GetBaseName(fs3, path, &result); @@ -1521,7 +1521,7 @@ static void test_CreateTextFile(void) /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1569,7 +1569,7 @@ static void test_WriteLine(void) ret = ReadFile(file, buffA, sizeof(buffA), &r, NULL); ok(ret && r, "read %d, got %d, %d\n", r, ret, GetLastError()); - len = MultiByteToWideChar(CP_ACP, 0, buffA, r, buffW, sizeof(buffW)/sizeof(WCHAR)); + len = MultiByteToWideChar(CP_ACP, 0, buffA, r, buffW, ARRAY_SIZE(buffW)); buffW[len] = 0; lstrcpyW(buff2W, nameW); lstrcatW(buff2W, crlfW); @@ -1655,7 +1655,7 @@ static void test_ReadAll(void) hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1801,7 +1801,7 @@ static void test_Read(void) ok(hr == S_OK, "got 0x%08x\n", hr); buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); @@ -2151,7 +2151,7 @@ static void test_GetExtensionName(void) HRESULT hr; int i; - for (i = 0; i < sizeof(extension_tests)/sizeof(extension_tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(extension_tests); i++) { path = SysAllocString(extension_tests[i].path); ext = NULL; @@ -2190,7 +2190,7 @@ static void test_GetSpecialFolder(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFolder_get_Path(folder, &path); ok(hr == S_OK, "got 0x%08x\n", hr); - GetWindowsDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); ok(!lstrcmpiW(pathW, path), "got %s, expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(pathW)); SysFreeString(path); IFolder_Release(folder); @@ -2199,7 +2199,7 @@ static void test_GetSpecialFolder(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFolder_get_Path(folder, &path); ok(hr == S_OK, "got 0x%08x\n", hr); - GetSystemDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW)); ok(!lstrcmpiW(pathW, path), "got %s, expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(pathW)); SysFreeString(path); IFolder_Release(folder); @@ -2208,7 +2208,7 @@ static void test_GetSpecialFolder(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFolder_get_Path(folder, &path); ok(hr == S_OK, "got 0x%08x\n", hr); - ret = GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + ret = GetTempPathW(ARRAY_SIZE(pathW), pathW); if (ret && pathW[ret-1] == '\\') pathW[ret-1] = 0; -- 2.14.3

2 2

[PATCH 1/3] dbghelp: Add a helper to check if a given module is the Wine loader.
by Zebediah Figura 30 May '18

30 May '18

--- dlls/dbghelp/module.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 9f90d5e..64dbd5a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -75,9 +75,16 @@ 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 wine64W[] = {'w','i','n','e','6','4',0}; + const WCHAR *filename = get_filename(module, NULL); + return !strcmpW(filename, wineW) || !strcmpW(filename, wine64W); +} + 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 +94,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 +462,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 +497,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; -- 2.7.4

1 2

[PATCH 17/17] rsaenh/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rsaenh/tests/rsaenh.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index bc8e798cdd..df31aeb54b 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1815,7 +1815,7 @@ static void test_hmac(void) { 0xcf, 0x10, 0x6b, 0xb6, 0x7d, 0x0f, 0x13, 0x32 }; int i; - for (i=0; i<sizeof(abData)/sizeof(BYTE); i++) abData[i] = (BYTE)i; + for (i=0; i < ARRAY_SIZE(abData); i++) abData[i] = (BYTE)i; if (!derive_key(CALG_RC2, &hKey, 56)) return; @@ -1829,7 +1829,7 @@ static void test_hmac(void) { result = CryptHashData(hHash, abData, sizeof(abData), 0); ok(result, "%08x\n", GetLastError()); - dwLen = sizeof(abData)/sizeof(BYTE); + dwLen = ARRAY_SIZE(abData); result = CryptGetHashParam(hHash, HP_HASHVAL, abData, &dwLen, 0); ok(result, "%08x\n", GetLastError()); @@ -1855,8 +1855,8 @@ static void test_mac(void) { static const BYTE mac_40[8] = { 0xb7, 0xa2, 0x46, 0xe9, 0x11, 0x31, 0xe0, 0xad}; int i; - for (i=0; i<sizeof(abData)/sizeof(BYTE); i++) abData[i] = (BYTE)i; - for (i=0; i<sizeof(abData)/sizeof(BYTE); i++) abEnc[i] = (BYTE)i; + for (i=0; i < ARRAY_SIZE(abData); i++) abData[i] = (BYTE)i; + for (i=0; i < ARRAY_SIZE(abData); i++) abEnc[i] = (BYTE)i; if (!derive_key(CALG_RC2, &hKey, 40)) return; @@ -1871,7 +1871,7 @@ static void test_mac(void) { result = CryptHashData(hHash, abData, sizeof(abData), 0); ok(result, "%08x\n", GetLastError()); - dwLen = sizeof(abData)/sizeof(BYTE); + dwLen = ARRAY_SIZE(abData); result = CryptGetHashParam(hHash, HP_HASHVAL, abData, &dwLen, 0); ok(result && dwLen == 8, "%08x, dwLen: %d\n", GetLastError(), dwLen); @@ -2725,7 +2725,7 @@ static void test_import_hmac(void) }; DWORD i; - for (i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) + for (i = 0; i < ARRAY_SIZE(cases); i++) { const struct rfc2202_test_case *test_case = &cases[i]; DWORD size = sizeof(BLOBHEADER) + sizeof(DWORD) + test_case->key_len; @@ -3822,13 +3822,13 @@ static void test_key_derivation(const char *prov) }, }; /* Due to differences between encryption from <= 2000 and >= XP some tests need to be skipped */ - int old_broken[sizeof(tests)/sizeof(tests[0])]; + int old_broken[ARRAY_SIZE(tests)]; memset(old_broken, 0, sizeof(old_broken)); old_broken[3] = old_broken[4] = old_broken[15] = old_broken[16] = 1; old_broken[27] = old_broken[28] = old_broken[39] = old_broken[40] = 1; uniquecontainer(NULL); - for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) + for (i=0; i < ARRAY_SIZE(tests); i++) { if (win2k && old_broken[i]) continue; @@ -3886,7 +3886,7 @@ err: START_TEST(rsaenh) { - for (iProv = 0; iProv < sizeof(szProviders) / sizeof(szProviders[0]); iProv++) + for (iProv = 0; iProv < ARRAY_SIZE(szProviders); iProv++) { if (!init_base_environment(szProviders[iProv], 0)) continue; -- 2.14.3

1 0

[PATCH 16/17] schedsvc/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index a383538220..4aaafb60f1 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -159,7 +159,7 @@ START_TEST(rpcapi) hr = SchRpcCreateFolder(Wine, NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); path = NULL; info = NULL; @@ -168,7 +168,7 @@ START_TEST(rpcapi) ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); - for (i = 0; i < sizeof(create_new_task)/sizeof(create_new_task[0]); i++) + for (i = 0; i < ARRAY_SIZE(create_new_task); i++) { path = NULL; info = NULL; @@ -207,7 +207,7 @@ START_TEST(rpcapi) ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); - for (i = 0; i < sizeof(open_existing_task)/sizeof(open_existing_task[0]); i++) + for (i = 0; i < ARRAY_SIZE(open_existing_task); i++) { path = NULL; info = NULL; -- 2.14.3

1 0

[PATCH 14/17] secure32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 6 +++--- dlls/secur32/tests/secur32.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index b9fdf6f237..6b1249d201 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1165,7 +1165,7 @@ static void testSignSeal(void) trace("Testing with more than one buffer.\n"); - crypt.cBuffers = sizeof(complex_data)/sizeof(complex_data[0]); + crypt.cBuffers = ARRAY_SIZE(complex_data); crypt.pBuffers = complex_data; complex_data[0].BufferType = SECBUFFER_DATA|SECBUFFER_READONLY_WITH_CHECKSUM; @@ -1436,7 +1436,7 @@ static void test_cred_multiple_use(void) getSecError(ret)); buffer_desc.ulVersion = SECBUFFER_VERSION; - buffer_desc.cBuffers = sizeof(buffers)/sizeof(buffers[0]); + buffer_desc.cBuffers = ARRAY_SIZE(buffers); buffer_desc.pBuffers = buffers; ret = pInitializeSecurityContextA(&cred, NULL, NULL, ISC_REQ_CONNECTION, @@ -1487,7 +1487,7 @@ static void test_null_auth_data(void) buffers[0].pvBuffer = HeapAlloc(GetProcessHeap(), 0, buffers[0].cbBuffer); buffer_desc.ulVersion = SECBUFFER_VERSION; - buffer_desc.cBuffers = sizeof(buffers)/sizeof(buffers[0]); + buffer_desc.cBuffers = ARRAY_SIZE(buffers); buffer_desc.pBuffers = buffers; size = sizeof(user); diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 40c272ada3..2d2c2a6925 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -67,7 +67,7 @@ static void testGetComputerObjectNameA(void) BOOLEAN rc; UINT i; - for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + for (i = 0; i < ARRAY_SIZE(formats); i++) { size = 0; SetLastError(0xdeadbeef); rc = pGetComputerObjectNameA(formats[i], NULL, &size); @@ -112,7 +112,7 @@ static void testGetComputerObjectNameW(void) BOOLEAN rc; UINT i; - for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + for (i = 0; i < ARRAY_SIZE(formats); i++) { size = 0; SetLastError(0xdeadbeef); rc = pGetComputerObjectNameW(formats[i], NULL, &size); @@ -134,7 +134,7 @@ static void testGetComputerObjectNameW(void) if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) continue; - size = sizeof(nameW)/sizeof(nameW[0]); + size = ARRAY_SIZE(nameW); SetLastError(0xdeadbeef); rc = pGetComputerObjectNameW(formats[i], nameW, &size); switch (formats[i]) @@ -158,7 +158,7 @@ static void testGetUserNameExA(void) BOOLEAN rc; UINT i; - for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + for (i = 0; i < ARRAY_SIZE(formats); i++) { size = sizeof(name); ZeroMemory(name, sizeof(name)); rc = pGetUserNameExA(formats[i], name, &size); @@ -205,7 +205,7 @@ static void testGetUserNameExW(void) BOOLEAN rc; UINT i; - for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + for (i = 0; i < ARRAY_SIZE(formats); i++) { size = sizeof(nameW); ZeroMemory(nameW, sizeof(nameW)); rc = pGetUserNameExW(formats[i], nameW, &size); -- 2.14.3

1 0

[PATCH 13/17] serialui/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/serialui/tests/confdlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/serialui/tests/confdlg.c b/dlls/serialui/tests/confdlg.c index 4606a75b60..bd541cda2b 100644 --- a/dlls/serialui/tests/confdlg.c +++ b/dlls/serialui/tests/confdlg.c @@ -165,7 +165,7 @@ static void test_drvCommConfigDialogW(void) /* test ports "com1" - "com4" */ for (i = 1; i < 5 ; i++) { sprintf(bufferA, fmt_comA, i); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); len = sizeof(pCC); ZeroMemory(pCC, sizeof(pCC)); SetLastError(0xdeadbeef); @@ -346,7 +346,7 @@ static void test_drvGetDefaultCommConfigW(void) /* test ports "com0" - "com10" */ for (i = 0; i < 11 ; i++) { sprintf(bufferA, fmt_comA, i); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); len = sizeof(pCC); ZeroMemory(pCC, sizeof(pCC)); SetLastError(0xdeadbeef); -- 2.14.3

1 0

[PATCH 11/17] snmpapi/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/snmpapi/tests/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 0c517c1738..0eb88165e0 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -211,7 +211,7 @@ static void test_SnmpUtilOidCpyFree(void) { INT ret; static UINT ids[] = { 1, 3, 6, 1, 4, 1, 311 }; - static AsnObjectIdentifier dst, src = { sizeof(ids) / sizeof(ids[0]), ids }; + static AsnObjectIdentifier dst, src = { ARRAY_SIZE(ids), ids }; /* These crashes under win98 */ if(0) -- 2.14.3

1 0

[PATCH 10/17] sxs/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sxs/tests/cache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c index d0c4817c72..19dd4b865e 100644 --- a/dlls/sxs/tests/cache.c +++ b/dlls/sxs/tests/cache.c @@ -155,12 +155,12 @@ static void test_QueryAssemblyInfo( void ) memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); info.pszCurrentAssemblyPathBuf = path; - info.cchBuf = sizeof(path)/sizeof(path[0]); + info.cchBuf = ARRAY_SIZE( path ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, comctlW, &info ); ok( hr == S_OK, "got %08x\n", hr ); ok( info.dwAssemblyFlags == 1, "got %08x\n", info.dwAssemblyFlags ); ok( !info.uliAssemblySizeInKB.u.LowPart, "got %u\n", info.uliAssemblySizeInKB.u.LowPart ); - ok( info.cchBuf == sizeof(path)/sizeof(path[0]), "got %u\n", info.cchBuf ); + ok( info.cchBuf == ARRAY_SIZE( path ), "got %u\n", info.cchBuf ); ok( path[0], "empty path\n" ); memset( &info, 0, sizeof(info) ); @@ -193,13 +193,13 @@ static void test_QueryAssemblyInfo( void ) memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); info.pszCurrentAssemblyPathBuf = path; - info.cchBuf = sizeof(path)/sizeof(path[0]); + info.cchBuf = ARRAY_SIZE( path ); path[0] = 0; hr = IAssemblyCache_QueryAssemblyInfo( cache, 2, comctlW, &info ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); ok( !info.dwAssemblyFlags, "got %08x\n", info.dwAssemblyFlags ); ok( !info.uliAssemblySizeInKB.u.LowPart, "got %u\n", info.uliAssemblySizeInKB.u.LowPart ); - ok( info.cchBuf == sizeof(path)/sizeof(path[0]), "got %u\n", info.cchBuf ); + ok( info.cchBuf == ARRAY_SIZE( path ), "got %u\n", info.cchBuf ); ok( !path[0], "got %s\n", wine_dbgstr_w(path) ); IAssemblyCache_Release( cache ); -- 2.14.3

1 0

[PATCH 09/17] taskschd/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 12c30e8db3..5fc3aab595 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -66,7 +66,7 @@ static void test_Connect(void) /* Win7 doesn't support UNC \\ prefix, but according to a user * comment on MSDN Win8 supports both ways. */ - len = sizeof(comp_name)/sizeof(comp_name[0]); + len = ARRAY_SIZE(comp_name); GetComputerNameW(comp_name, &len); V_VT(&v_null) = VT_NULL; @@ -486,7 +486,7 @@ static void test_FolderCollection(void) hr = ITaskFolderCollection_get_Item(folders, idx, NULL); ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); - for (i = 0; i < sizeof(vt)/sizeof(vt[0]); i++) + for (i = 0; i < ARRAY_SIZE(vt); i++) { set_var(vt[i], &idx, 1); hr = ITaskFolderCollection_get_Item(folders, idx, &subfolder); @@ -774,9 +774,9 @@ static void test_GetTask(void) ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); - for (i = 0; i < sizeof(create_new_task)/sizeof(create_new_task[0]); i++) + for (i = 0; i < ARRAY_SIZE(create_new_task); i++) { hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, create_new_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == create_new_task[i].hr, "%d: expected %#x, got %#x\n", i, create_new_task[i].hr, hr); @@ -810,7 +810,7 @@ todo_wine hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE_OR_UPDATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == S_OK, "RegisterTask error %#x\n", hr); - for (i = 0; i < sizeof(open_existing_task)/sizeof(open_existing_task[0]); i++) + for (i = 0; i < ARRAY_SIZE(open_existing_task); i++) { hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, open_existing_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); ok(hr == open_existing_task[i].hr, "%d: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); @@ -841,7 +841,7 @@ todo_wine hr = ITaskFolder_RegisterTask(folder, Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskFolder_RegisterTask(folder, Task2, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); ok(hr == S_OK, "RegisterTask error %#x\n", hr); @@ -1262,7 +1262,7 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_StartBoundary failed: %08x\n", hr); ok(start_boundary == NULL, "start_boundary not set\n"); - for (i = 0; i < sizeof(start_test)/sizeof(start_test[0]); i++) + for (i = 0; i < ARRAY_SIZE(start_test); i++) { start_boundary = SysAllocString(start_test[i].str); hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); @@ -1569,33 +1569,33 @@ static void test_TaskDefinition(void) hr = ITaskDefinition_put_XmlText(taskdef, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == S_OK, "put_XmlText error %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == SCHED_E_NAMESPACE, "expected SCHED_E_NAMESPACE, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); todo_wine ok(hr == SCHED_E_UNEXPECTEDNODE, "expected SCHED_E_UNEXPECTEDNODE, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == S_OK, "put_XmlText error %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml5, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml5, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); todo_wine ok(hr == SCHED_E_MISSINGNODE, "expected SCHED_E_MISSINGNODE, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml6, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml6, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == SCHED_E_MALFORMEDXML, "expected SCHED_E_MALFORMEDXML, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml7, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml7, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == SCHED_E_INVALIDVALUE, "expected SCHED_E_INVALIDVALUE, got %#x\n", hr); @@ -1604,7 +1604,7 @@ todo_wine ok(hr == SCHED_E_MALFORMEDXML, "expected SCHED_E_MALFORMEDXML, got %#x\n", hr); /* test registration info */ - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == S_OK, "put_XmlText error %#x\n", hr); hr = ITaskDefinition_get_RegistrationInfo(taskdef, &reginfo); @@ -1697,7 +1697,7 @@ if (hr == S_OK) IRegistrationInfo_Release(reginfo); - MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == S_OK, "put_XmlText error %#x\n", hr); hr = ITaskDefinition_get_RegistrationInfo(taskdef, &reginfo); -- 2.14.3

1 0

[PATCH 08/17] twain_32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/twain_32/tests/dsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index ab6e84fd6a..1e9764dccb 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -663,7 +663,7 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) UINT16 *u = (UINT16 *) a->ItemList; trace("%d Capabilities:\n", a->NumItems); for (i = 0; i < a->NumItems; i++) - if (u[i] < sizeof(capabilities) / sizeof(capabilities[0])) + if (u[i] < ARRAY_SIZE(capabilities)) { capabilities[u[i]] = 1; trace(" %d: 0x%x\n", i, u[i]); -- 2.14.3

1 0

[PATCH 07/17] ucrtbase/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 6 +++--- dlls/ucrtbase/tests/printf.c | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 2bb221b84e..18838a3d77 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -703,7 +703,7 @@ static void test_math_errors(void) /* necessary so that exp(1e100)==INFINITY on glibc, we can remove this if we change our implementation */ p_fesetround(FE_TONEAREST); - for(i = 0; i < sizeof(testsd)/sizeof(testsd[0]); i++) { + for(i = 0; i < ARRAY_SIZE(testsd); i++) { p_funcd = (void*)GetProcAddress(module, testsd[i].func); *p_errno() = -1; exception.type = -1; @@ -717,7 +717,7 @@ static void test_math_errors(void) "%s(%f) got exception arg1 %f\n", testsd[i].func, testsd[i].x, exception.arg1); } - for(i = 0; i < sizeof(tests2d)/sizeof(tests2d[0]); i++) { + for(i = 0; i < ARRAY_SIZE(tests2d); i++) { p_func2d = (void*)GetProcAddress(module, tests2d[i].func); *p_errno() = -1; exception.type = -1; @@ -733,7 +733,7 @@ static void test_math_errors(void) "%s(%f, %f) got exception arg2 %f\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, exception.arg2); } - for(i = 0; i < sizeof(testsdl)/sizeof(testsdl[0]); i++) { + for(i = 0; i < ARRAY_SIZE(testsdl); i++) { p_funcdl = (void*)GetProcAddress(module, testsdl[i].func); *p_errno() = -1; exception.type = -1; diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 0e3800371f..41bb6a335e 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -171,7 +171,7 @@ static void test_snprintf (void) unsigned int i; /* Legacy _snprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt) > bufsiz ? -1 : strlen(fmt); const int n = vsprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); @@ -184,7 +184,7 @@ static void test_snprintf (void) } /* C99 snprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt); const int n = vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buffer, bufsiz, fmt); @@ -199,7 +199,7 @@ static void test_snprintf (void) } /* swprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt) >= bufsiz ? -2 : strlen(fmt); const int n = vsprintf_wrapper (0, buffer, bufsiz, fmt); @@ -242,11 +242,11 @@ static void test_swprintf (void) wchar_t buffer[8]; char narrow[8], narrow_fmt[16]; - const int bufsiz = sizeof buffer / sizeof buffer[0]; + const int bufsiz = ARRAY_SIZE(buffer); unsigned int i; /* Legacy _snprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt) > bufsiz ? -1 : wcslen(fmt); const int n = vswprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); @@ -261,7 +261,7 @@ static void test_swprintf (void) } /* C99 snprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt); const int n = vswprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buffer, bufsiz, fmt); @@ -278,7 +278,7 @@ static void test_swprintf (void) } /* swprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt) >= bufsiz ? -2 : wcslen(fmt); const int n = vswprintf_wrapper (0, buffer, bufsiz, fmt); @@ -411,12 +411,12 @@ static void test_fwprintf(void) p_fclose(fp); fp = p_fopen(file_name, "rb"); - p_fgetws(bufw, sizeof(bufw)/sizeof(bufw[0]), fp); + p_fgetws(bufw, ARRAY_SIZE(bufw), fp); ret = p_ftell(fp); ok(ret == 24, "ftell returned %d\n", ret); ok(!wcscmp(bufw, simple), "buf = %s\n", wine_dbgstr_w(bufw)); - p_fgetws(bufw, sizeof(bufw)/sizeof(bufw[0]), fp); + p_fgetws(bufw, ARRAY_SIZE(bufw), fp); ret = p_ftell(fp); ok(ret == 52, "ret = %d\n", ret); ok(!memcmp(bufw, cont, 28), "buf = %s\n", wine_dbgstr_w(bufw)); -- 2.14.3

1 0

[PATCH 06/17] userenv/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/userenv/tests/userenv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 5647cf340b..79b4d59a61 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -158,7 +158,7 @@ static void test_create_env(void) } /* Test for common environment variables (NT4 and higher) */ - for (i = 0; i < sizeof(common_vars)/sizeof(common_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE(common_vars); i++) { for (j = 0; j < 4; j++) { @@ -175,7 +175,7 @@ static void test_create_env(void) } else { - for (i = 0; i < sizeof(common_post_nt4_vars)/sizeof(common_post_nt4_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE(common_post_nt4_vars); i++) { for (j = 0; j < 4; j++) { @@ -190,7 +190,7 @@ static void test_create_env(void) pIsWow64Process(GetCurrentProcess(), &is_wow64); if (sizeof(void*)==8 || is_wow64) { - for (i = 0; i < sizeof(common_win64_vars)/sizeof(common_win64_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE(common_win64_vars); i++) { for (j=0; j<4; j++) { @@ -215,7 +215,7 @@ static void test_create_env(void) expect(TRUE, r); if (r) HeapFree(GetProcessHeap(), 0, st); - for (i = 0; i < sizeof(env) / sizeof(env[0]); i++) + for (i = 0; i < ARRAY_SIZE(env); i++) { r = DestroyEnvironmentBlock(env[i]); expect(TRUE, r); -- 2.14.3

1 0

[PATCH 05/17] uxtheme/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/tests/system.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index c71eaa2cb4..b3a861eaa6 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -443,9 +443,8 @@ static void test_GetCurrentThemeName(void) ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* The same is true if the number of characters is too small for Color and/or Size */ - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), - currentColor, 2, - currentSize, sizeof(currentSize) / sizeof(WCHAR)); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, 2, + currentSize, ARRAY_SIZE(currentSize)); if (bThemeActive) todo_wine ok(hRes == E_NOT_SUFFICIENT_BUFFER || @@ -455,7 +454,7 @@ static void test_GetCurrentThemeName(void) ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* Given number of characters is correct */ - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), NULL, 0, NULL, 0); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), NULL, 0, NULL, 0); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else @@ -471,26 +470,23 @@ static void test_GetCurrentThemeName(void) "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* The too large case is only for the theme name, not for color name or size name */ - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentTheme), - currentSize, sizeof(currentSize) / sizeof(WCHAR)); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, + sizeof(currentTheme), currentSize, ARRAY_SIZE(currentSize)); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentTheme) / sizeof(WCHAR), - currentSize, sizeof(currentSize)); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, + ARRAY_SIZE(currentTheme), currentSize, sizeof(currentSize)); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* Correct call */ - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentColor) / sizeof(WCHAR), - currentSize, sizeof(currentSize) / sizeof(WCHAR)); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, + ARRAY_SIZE(currentColor), currentSize, ARRAY_SIZE(currentSize)); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else -- 2.14.3

1 0

[PATCH 03/17] version/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/version/tests/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index b99a335d81..44e7511d8b 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -548,7 +548,7 @@ static void test_VerQueryValueA(void) ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); - for (i = 0; i < sizeof(value_name)/sizeof(value_name[0]); i++) + for (i = 0; i < ARRAY_SIZE(value_name); i++) { sprintf(buf, "\\StringFileInfo\\%08x\\%s", translation, value_name[i]); p = (char *)0xdeadbeef; @@ -692,7 +692,7 @@ static void test_GetFileVersionInfoEx(void) return; } - for (i = 0; i < sizeof(test_flags)/sizeof(test_flags[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_flags); i++) { size = pGetFileVersionInfoSizeExW(test_flags[i], kernel32W, NULL); ok(size, "[%u] GetFileVersionInfoSizeEx(kernel32) error %u\n", i, GetLastError()); -- 2.14.3

1 0

[PATCH 2/2] mshtml: Use proper document mode for document fragment objects.
by Jacek Caban 30 May '18

30 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/tests/documentmode.js | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+)

1 0

[PATCH 1/2] mshtml: Use case insensitive comparition in parse_ua_compatible.
by Jacek Caban 30 May '18

30 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mutation.c | 3 ++- dlls/mshtml/tests/script.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH] d3d10_1/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 30 May '18

30 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 7c2b3ba251..f6abea0ced 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -104,7 +104,7 @@ static void test_create_device(void) HWND window; HRESULT hr; - for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i) { if (SUCCEEDED(hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, d3d10_feature_levels[i], D3D10_1_SDK_VERSION, &device))) @@ -279,7 +279,7 @@ static void test_device_interfaces(void) unsigned int i; HRESULT hr; - for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i) { struct device_desc device_desc; @@ -320,7 +320,7 @@ static void test_device_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } - for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i) { struct device_desc device_desc; @@ -614,7 +614,7 @@ static void test_create_blend_state(void) refcount = ID3D10BlendState1_Release(blend_state2); ok(!refcount, "Blend state has %u references left.\n", refcount); - for (i = 0; i < sizeof(desc_conversion_tests) / sizeof(*desc_conversion_tests); ++i) + for (i = 0; i < ARRAY_SIZE(desc_conversion_tests); ++i) { const D3D10_BLEND_DESC1 *current_desc = &desc_conversion_tests[i]; -- 2.14.3

2 1

[PATCH 1/9] dxgi: Add FIXME() for ignored output parameter in dxgi_factory_CreateSwapChainForHwnd().
by Józef Kucia 30 May '18

30 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/factory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a3eb1085b309..4fe684b2a915 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -294,6 +294,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa return DXGI_ERROR_INVALID_CALL; } + if (output) + FIXME("Ignoring output %p.\n", output); + if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { hr = d3d11_swapchain_create(dxgi_device, window, swapchain_desc, fullscreen_desc, swapchain); -- 2.16.1

5 17

[PATCH] testbot: Fix error checking on a Steps::Save() call.
by Francois Gouget 30 May '18

30 May '18

Collection::Save() returns three values, unlike Item::Save() which only returns two! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 6be271ba3..ef0d98e24 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -98,7 +98,7 @@ sub OnDelete($) my $Steps = $self->Steps; map { $_->PreviousNo(undef) } @{$Steps->GetItems()}; - my ($_ErrProperty, $ErrMessage) = $Steps->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Steps->Save(); return $ErrMessage || $self->SUPER::OnDelete(); } -- 2.17.0

1 0

[PATCH v2 4/4] msi/tests: Test deferral of SelfRegModules and SelfUnregModules.
by Hans Leidekker 30 May '18

30 May '18

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 25 +++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 41 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 9dfa623758..ac94c38ed9 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -774,15 +774,28 @@ static const char sr_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "SelfUnregModules\t\t3800\n" + "su_immediate\tREMOVE\t3801\n" + "su_deferred\tREMOVE\t3802\n" "RemoveFiles\t\t3900\n" "InstallFiles\t\t4000\n" "SelfRegModules\t\t4100\n" + "sr_immediate\tNOT REMOVE\t4101\n" + "sr_deferred\tNOT REMOVE\t4102\n" "CreateShortcuts\t\t4600\n" "RegisterProduct\t\t5100\n" "PublishFeatures\t\t5200\n" "PublishProduct\t\t5300\n" "InstallFinalize\t\t6600\n"; +static const char sr_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "sr_immediate\t1\tcustom.dll\tsr_absent\n" + "sr_deferred\t1025\tcustom.dll\tsr_present\n" + "su_immediate\t1\tcustom.dll\tsr_present\n" + "su_deferred\t1025\tcustom.dll\tsr_absent\n"; + static const char font_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" @@ -2128,6 +2141,7 @@ static const msi_table sr_tables[] = ADD_TABLE(sr_file), ADD_TABLE(sr_selfreg), ADD_TABLE(sr_install_exec_seq), + ADD_TABLE(sr_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index b7da2b8fcc..3fb538203f 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1833,3 +1833,28 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) return ERROR_SUCCESS; } + +UINT WINAPI sr_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI sr_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 058a9172f1..2ec5b6cc6d 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -43,6 +43,8 @@ @ stdcall sds_absent(long) @ stdcall sis_present(long) @ stdcall sis_absent(long) +@ stdcall sr_present(long) +@ stdcall sr_absent(long) @ stdcall sss_started(long) @ stdcall sss_stopped(long) @ stdcall tl_present(long) -- 2.11.0

2 1

[PATCH] winex11: Get rid of unnecessary assignments.
by Józef Kucia 30 May '18

30 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/xvidmode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index f055c3a53d05..ba9cdf76642e 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -368,7 +368,7 @@ static void interpolate_gamma_ramp(WORD *dst_r, WORD *dst_g, WORD *dst_b, unsign static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) { WORD *red, *green, *blue; - BOOL ret = FALSE; + BOOL ret; if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) { @@ -378,7 +378,7 @@ static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) } else { - if (!(red = heap_calloc(3 * xf86vm_gammaramp_size, sizeof(*red)))) + if (!(red = heap_calloc(xf86vm_gammaramp_size, 3 * sizeof(*red)))) return FALSE; green = red + xf86vm_gammaramp_size; blue = green + xf86vm_gammaramp_size; @@ -397,7 +397,7 @@ static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) { WORD *red, *green, *blue; - BOOL ret = FALSE; + BOOL ret; if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) { @@ -407,7 +407,7 @@ static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) } else { - if (!(red = heap_calloc(3 * xf86vm_gammaramp_size, sizeof(*red)))) + if (!(red = heap_calloc(xf86vm_gammaramp_size, 3 * sizeof(*red)))) return FALSE; green = red + xf86vm_gammaramp_size; blue = green + xf86vm_gammaramp_size; -- 2.16.1

1 0

[PATCH v2 1/4] msi/tests: Test registration of a valid typelib.
by Hans Leidekker 30 May '18

30 May '18

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/Makefile.in | 4 +++- dlls/msi/tests/action.c | 49 ++++++++++++++++++++++++++++++++++++++-------- dlls/msi/tests/rsrc.rc | 22 +++++++++++++++++++++ dlls/msi/tests/typelib.idl | 29 +++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 9 deletions(-) create mode 100644 dlls/msi/tests/rsrc.rc create mode 100644 dlls/msi/tests/typelib.idl diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 18a6457e4a..5c7e81eeed 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -15,5 +15,7 @@ SOURCES = \ package.c \ patch.c \ record.c \ + rsrc.rc \ source.c \ - suminfo.c + suminfo.c \ + typelib.idl diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index ea8c0e86c7..1cf9e9e741 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <stdlib.h> +#define COBJMACROS #include <windows.h> #include <msiquery.h> #include <msidefs.h> @@ -36,6 +37,7 @@ #include "wine/test.h" #include "utils.h" +#include "typelib.h" static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE *); @@ -1003,10 +1005,10 @@ static const char tl_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" - "RemoveFiles\t\t1700\n" - "InstallFiles\t\t2000\n" - "RegisterTypeLibraries\tREGISTER_TYPELIB=1\t3000\n" "UnregisterTypeLibraries\t\t3100\n" + "RemoveFiles\t\t3200\n" + "InstallFiles\t\t3300\n" + "RegisterTypeLibraries\t\t3400\n" "RegisterProduct\t\t5100\n" "PublishFeatures\t\t5200\n" "PublishProduct\t\t5300\n" @@ -2647,6 +2649,24 @@ static DWORD get_estimated_size(void) return size; } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void test_register_product(void) { UINT r; @@ -5594,6 +5614,8 @@ error: static void test_register_typelib(void) { + ITypeLib *tlb; + HRESULT hr; UINT r; if (is_process_limited()) @@ -5602,26 +5624,37 @@ static void test_register_typelib(void) return; } + /* UnregisterTypeLibraries action fails in 64-bit Windows <= 7 */ + if (sizeof(void *) == 8) + { + win_skip("broken on 64-bit Windows\n"); + return; + } + create_test_files(); - create_file("msitest\\typelib.dll", 1000); + extract_resource("typelib.tlb", "TYPELIB", "msitest\\typelib.dll"); create_database(msifile, tl_tables, sizeof(tl_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - r = MsiInstallProductA(msifile, "REGISTER_TYPELIB=1"); + r = MsiInstallProductA(msifile, NULL); if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); goto error; } - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(r == ERROR_SUCCESS, "got %u\n", r); - r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); + ok(hr == S_OK, "got %#x\n", hr); + ITypeLib_Release(tlb); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); + ok(hr == TYPE_E_LIBNOTREGISTERED, "got %#x\n", hr); + ok(!delete_pf("msitest\\typelib.dll", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); diff --git a/dlls/msi/tests/rsrc.rc b/dlls/msi/tests/rsrc.rc new file mode 100644 index 0000000000..eca1ae5790 --- /dev/null +++ b/dlls/msi/tests/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: typelib.tlb */ +typelib.tlb TYPELIB typelib.tlb diff --git a/dlls/msi/tests/typelib.idl b/dlls/msi/tests/typelib.idl new file mode 100644 index 0000000000..f447c60ea0 --- /dev/null +++ b/dlls/msi/tests/typelib.idl @@ -0,0 +1,29 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep ident +#pragma makedep typelib +#pragma makedep header + +[ + uuid(eac5166a-9734-4d91-878f-1dd02304c66c), + version(7.1) +] +library register_test +{ +} -- 2.11.0

2 1

[PATCH 2/2] wsdapi/tests: Expand ProbeHandler tests.
by Owen Rudge 30 May '18

30 May '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 113 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 102 insertions(+), 11 deletions(-)

2 1

[PATCH 1/2] wsdapi/tests: Ensure probe message is given unique GUID.
by Owen Rudge 30 May '18

30 May '18

This patch fixes a potential issue on the Wine test VMs where messages can be received by other VMs before they are ready to process them. wsdapi.dll then filters out the subsequent duplicate messages from the correct VM and the test fails. Avoid this by not using a hard-coded GUID. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 4 deletions(-)

2 1

[PATCH v2 3/4] msi/tests: Test self-registration of a valid DLL.
by Hans Leidekker 30 May '18

30 May '18

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/Makefile.in | 2 ++ dlls/msi/tests/action.c | 83 ++++++++++++++++++++++++++++++--------------- dlls/msi/tests/selfreg.c | 38 +++++++++++++++++++++ dlls/msi/tests/selfreg.spec | 2 ++ 4 files changed, 97 insertions(+), 28 deletions(-) create mode 100644 dlls/msi/tests/selfreg.c create mode 100644 dlls/msi/tests/selfreg.spec diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 5f85d119fa..a0fdcaeb84 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -16,6 +16,8 @@ SOURCES = \ patch.c \ record.c \ rsrc.rc \ + selfreg.c \ + selfreg.spec \ source.c \ suminfo.c \ typelib.idl diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 306bfae6f8..9dfa623758 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -733,30 +733,55 @@ static const char cf_custom_action_dat[] = "rf_immediate\t1\tcustom.dll\tcf_present\n" "rf_deferred\t1025\tcustom.dll\tcf_absent\n"; +static const char sr_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "selfreg.dll\tselfreg\tselfreg.dll\t1000\t\t\t8192\t1\n"; + +static const char sr_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "selfreg\t\t\tselfreg feature\t1\t2\tMSITESTDIR\t0\n"; + +static const char sr_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "selfreg\tselfreg\n"; + +static const char sr_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "selfreg\t{BB4C26FD-89D8-4E49-AF1C-DB4DCB5BF1B0}\tMSITESTDIR\t0\t\tselfreg.dll\n"; + static const char sr_selfreg_dat[] = "File_\tCost\n" "s72\tI2\n" "SelfReg\tFile_\n" - "one.txt\t1\n"; + "selfreg.dll\t\n"; static const char sr_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" "CostInitialize\t\t800\n" "FileCost\t\t900\n" - "ResolveSource\t\t950\n" - "MoveFiles\t\t1700\n" - "SelfUnregModules\t\t3900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "SelfUnregModules\t\t3800\n" + "RemoveFiles\t\t3900\n" "InstallFiles\t\t4000\n" - "DuplicateFiles\t\t4500\n" - "WriteEnvironmentStrings\t\t4550\n" + "SelfRegModules\t\t4100\n" "CreateShortcuts\t\t4600\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100\n"; + "RegisterProduct\t\t5100\n" + "PublishFeatures\t\t5200\n" + "PublishProduct\t\t5300\n" + "InstallFinalize\t\t6600\n"; static const char font_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" @@ -2096,11 +2121,11 @@ static const msi_table sis_tables[] = static const msi_table sr_tables[] = { - ADD_TABLE(component), + ADD_TABLE(sr_component), ADD_TABLE(directory), - ADD_TABLE(feature), - ADD_TABLE(feature_comp), - ADD_TABLE(file), + ADD_TABLE(sr_feature), + ADD_TABLE(sr_feature_comp), + ADD_TABLE(sr_file), ADD_TABLE(sr_selfreg), ADD_TABLE(sr_install_exec_seq), ADD_TABLE(media), @@ -5395,6 +5420,7 @@ error: static void test_self_registration(void) { + HKEY key; UINT r; if (is_process_limited()) @@ -5404,6 +5430,7 @@ static void test_self_registration(void) } create_test_files(); + extract_resource("selfreg.dll", "TESTDLL", "msitest\\selfreg.dll"); create_database(msifile, sr_tables, sizeof(sr_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); @@ -5416,21 +5443,21 @@ static void test_self_registration(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); - ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); - ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\changed", FALSE), "Directory not created\n"); - ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); - ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); + r = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); + ok(!r, "got %u\n", r); + RegCloseKey(key); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(!r, "got %u\n", r); + + r = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); + ok(r == ERROR_FILE_NOT_FOUND, "got %u\n", r); + + ok(!delete_pf("msitest\\selfreg.dll", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); error: + DeleteFileA("msitest\\selfreg.dll"); delete_test_files(); DeleteFileA(msifile); } diff --git a/dlls/msi/tests/selfreg.c b/dlls/msi/tests/selfreg.c new file mode 100644 index 0000000000..668e742e9b --- /dev/null +++ b/dlls/msi/tests/selfreg.c @@ -0,0 +1,38 @@ +/* + * DLL for testing self-registration + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> + +HRESULT WINAPI DllRegisterServer(void) +{ + HKEY key; + RegCreateKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); + RegCloseKey(key); + return S_OK; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + RegDeleteKeyA(HKEY_CLASSES_ROOT, "selfreg_test"); + return S_OK; +} diff --git a/dlls/msi/tests/selfreg.spec b/dlls/msi/tests/selfreg.spec new file mode 100644 index 0000000000..0f9b07355f --- /dev/null +++ b/dlls/msi/tests/selfreg.spec @@ -0,0 +1,2 @@ +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() -- 2.11.0

1 0

[PATCH v2 2/4] msi/tests: Test deferral of RegisterTypeLibraries and UnregisterTypeLibraries.
by Hans Leidekker 30 May '18

30 May '18

From: Zebediah Figura <z.figura12(a)gmail.com> v2: Fix compiler warning. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 29 +++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 5c7e81eeed..5f85d119fa 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version odbccp32 -custom_IMPORTS = uuid msi ole32 shell32 advapi32 odbccp32 +custom_IMPORTS = uuid msi ole32 shell32 advapi32 odbccp32 oleaut32 SOURCES = \ action.c \ diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1cf9e9e741..306bfae6f8 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1006,14 +1006,27 @@ static const char tl_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "UnregisterTypeLibraries\t\t3100\n" + "ut_immediate\tREMOVE\t3101\n" + "ut_deferred\tREMOVE\t3102\n" "RemoveFiles\t\t3200\n" "InstallFiles\t\t3300\n" "RegisterTypeLibraries\t\t3400\n" + "rt_immediate\tNOT REMOVE\t3401\n" + "rt_deferred\tNOT REMOVE\t3402\n" "RegisterProduct\t\t5100\n" "PublishFeatures\t\t5200\n" "PublishProduct\t\t5300\n" "InstallFinalize\t\t6000\n"; +static const char tl_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rt_immediate\t1\tcustom.dll\ttl_absent\n" + "rt_deferred\t1025\tcustom.dll\ttl_present\n" + "ut_immediate\t1\tcustom.dll\ttl_present\n" + "ut_deferred\t1025\tcustom.dll\ttl_absent\n"; + static const char crs_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2146,6 +2159,7 @@ static const msi_table tl_tables[] = ADD_TABLE(tl_file), ADD_TABLE(tl_typelib), ADD_TABLE(tl_install_exec_seq), + ADD_TABLE(tl_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 7a3f01ed29..b7da2b8fcc 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1804,3 +1804,32 @@ todo_wine return ERROR_SUCCESS; } + +static const GUID LIBID_register_test = + {0xeac5166a, 0x9734, 0x4d91, {0x87,0x8f, 0x1d,0xd0,0x23,0x04,0xc6,0x6c}}; + +UINT WINAPI tl_present(MSIHANDLE hinst) +{ + ITypeLib *tlb; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, hr == S_OK, "got %#x\n", hr); + if (tlb) + ITypeLib_Release(tlb); + + return ERROR_SUCCESS; +} + +UINT WINAPI tl_absent(MSIHANDLE hinst) +{ + ITypeLib *tlb; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, hr == TYPE_E_LIBNOTREGISTERED, "got %#x\n", hr); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index eec6a43c0a..058a9172f1 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -45,3 +45,5 @@ @ stdcall sis_absent(long) @ stdcall sss_started(long) @ stdcall sss_stopped(long) +@ stdcall tl_present(long) +@ stdcall tl_absent(long) -- 2.11.0

1 0

[PATCH] widl: Prefer types defined in the same typelib to imported types.
by Zebediah Figura 30 May '18

30 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes the warnings reported by Alexandre Julliard in reply to 146588. tools/widl/write_msft.c | 56 +++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 52c68b4..f7e53e4 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -993,7 +993,13 @@ static int encode_type( importinfo_t *importinfo; int typeinfo_offset; - if ((importinfo = find_importinfo(typelib, type->name))) + if (type->typelib_idx > -1) + { + chat("encode_type: VT_USERDEFINED - found already defined type %s at %d\n", + type->name, type->typelib_idx); + typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx]; + } + else if ((importinfo = find_importinfo(typelib, type->name))) { chat("encode_type: VT_USERDEFINED - found imported type %s in %s\n", type->name, importinfo->importlib->name); @@ -1003,36 +1009,32 @@ static int encode_type( else { /* typedef'd types without public attribute aren't included in the typelib */ - while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) + while (type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) type = type_alias_get_aliasee(type); - chat("encode_type: VT_USERDEFINED - type %p name = %s real type %d idx %d\n", type, - type->name, type_get_type(type), type->typelib_idx); + chat("encode_type: VT_USERDEFINED - adding new type %s, real type %d\n", + type->name, type_get_type(type)); - if (type->typelib_idx == -1) + switch (type_get_type(type)) { - chat("encode_type: trying to ref not added type\n"); - switch (type_get_type(type)) - { - case TYPE_STRUCT: - add_structure_typeinfo(typelib, type); - break; - case TYPE_INTERFACE: - add_interface_typeinfo(typelib, type); - break; - case TYPE_ENUM: - add_enum_typeinfo(typelib, type); - break; - case TYPE_UNION: - add_union_typeinfo(typelib, type); - break; - case TYPE_COCLASS: - add_coclass_typeinfo(typelib, type); - break; - default: - error("encode_type: VT_USERDEFINED - unhandled type %d\n", - type_get_type(type)); - } + case TYPE_STRUCT: + add_structure_typeinfo(typelib, type); + break; + case TYPE_INTERFACE: + add_interface_typeinfo(typelib, type); + break; + case TYPE_ENUM: + add_enum_typeinfo(typelib, type); + break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; + case TYPE_COCLASS: + add_coclass_typeinfo(typelib, type); + break; + default: + error("encode_type: VT_USERDEFINED - unhandled type %d\n", + type_get_type(type)); } typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx]; -- 2.7.4

2 1

[PATCH] shell32: Check the return value of DoPaste
by Alistair Leslie-Hughes 30 May '18

30 May '18

Based of patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlview_cmenu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fc761e1..74270b5 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1142,7 +1142,8 @@ static BOOL DoPaste(ContextMenu *This) /* do the copy/move */ if (psfhlpdst && psfhlpsrc) { - ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl); + if (SUCCEEDED(ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl))) + bSuccess = TRUE; /* FIXME handle move ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, apidl); */ @@ -1195,6 +1196,7 @@ static HRESULT WINAPI BackgroundMenu_InvokeCommand( IShellBrowser *browser; IShellView *view = NULL; HWND hWnd = NULL; + HRESULT hr = S_OK; TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n", This, lpcmi, lpcmi->lpVerb, lpcmi->hwnd); @@ -1239,7 +1241,8 @@ static HRESULT WINAPI BackgroundMenu_InvokeCommand( break; case FCIDM_SHVIEW_INSERT: - DoPaste(This); + if (!DoPaste(This)) + hr = E_FAIL; break; case FCIDM_SHVIEW_PROPERTIES: @@ -1260,7 +1263,7 @@ static HRESULT WINAPI BackgroundMenu_InvokeCommand( if (view) IShellView_Release(view); - return S_OK; + return hr; } static HRESULT WINAPI BackgroundMenu_GetCommandString( -- 1.9.1

2 1

[PATCH 1/4] msi/tests: Test registration of a valid typelib.
by Zebediah Figura 30 May '18

30 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- The test fails on 64-bit versions of Windows <= 7, so I must assume it to be a bug fixed in Windows 8. dlls/msi/tests/Makefile.in | 4 +++- dlls/msi/tests/action.c | 49 ++++++++++++++++++++++++++++++++++++++-------- dlls/msi/tests/rsrc.rc | 22 +++++++++++++++++++++ dlls/msi/tests/typelib.idl | 29 +++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 9 deletions(-) create mode 100644 dlls/msi/tests/rsrc.rc create mode 100644 dlls/msi/tests/typelib.idl diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 18a6457..5c7e81e 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -15,5 +15,7 @@ SOURCES = \ package.c \ patch.c \ record.c \ + rsrc.rc \ source.c \ - suminfo.c + suminfo.c \ + typelib.idl diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index ea8c0e8..1cf9e9e 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <stdlib.h> +#define COBJMACROS #include <windows.h> #include <msiquery.h> #include <msidefs.h> @@ -36,6 +37,7 @@ #include "wine/test.h" #include "utils.h" +#include "typelib.h" static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE *); @@ -1003,10 +1005,10 @@ static const char tl_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" - "RemoveFiles\t\t1700\n" - "InstallFiles\t\t2000\n" - "RegisterTypeLibraries\tREGISTER_TYPELIB=1\t3000\n" "UnregisterTypeLibraries\t\t3100\n" + "RemoveFiles\t\t3200\n" + "InstallFiles\t\t3300\n" + "RegisterTypeLibraries\t\t3400\n" "RegisterProduct\t\t5100\n" "PublishFeatures\t\t5200\n" "PublishProduct\t\t5300\n" @@ -2647,6 +2649,24 @@ static DWORD get_estimated_size(void) return size; } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void test_register_product(void) { UINT r; @@ -5594,6 +5614,8 @@ error: static void test_register_typelib(void) { + ITypeLib *tlb; + HRESULT hr; UINT r; if (is_process_limited()) @@ -5602,26 +5624,37 @@ static void test_register_typelib(void) return; } + /* UnregisterTypeLibraries action fails in 64-bit Windows <= 7 */ + if (sizeof(void *) == 8) + { + win_skip("broken on 64-bit Windows\n"); + return; + } + create_test_files(); - create_file("msitest\\typelib.dll", 1000); + extract_resource("typelib.tlb", "TYPELIB", "msitest\\typelib.dll"); create_database(msifile, tl_tables, sizeof(tl_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - r = MsiInstallProductA(msifile, "REGISTER_TYPELIB=1"); + r = MsiInstallProductA(msifile, NULL); if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); goto error; } - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(r == ERROR_SUCCESS, "got %u\n", r); - r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); + ok(hr == S_OK, "got %#x\n", hr); + ITypeLib_Release(tlb); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); + ok(hr == TYPE_E_LIBNOTREGISTERED, "got %#x\n", hr); + ok(!delete_pf("msitest\\typelib.dll", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); diff --git a/dlls/msi/tests/rsrc.rc b/dlls/msi/tests/rsrc.rc new file mode 100644 index 0000000..eca1ae5 --- /dev/null +++ b/dlls/msi/tests/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: typelib.tlb */ +typelib.tlb TYPELIB typelib.tlb diff --git a/dlls/msi/tests/typelib.idl b/dlls/msi/tests/typelib.idl new file mode 100644 index 0000000..f447c60 --- /dev/null +++ b/dlls/msi/tests/typelib.idl @@ -0,0 +1,29 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep ident +#pragma makedep typelib +#pragma makedep header + +[ + uuid(eac5166a-9734-4d91-878f-1dd02304c66c), + version(7.1) +] +library register_test +{ +} -- 2.7.4

2 5

[PATCH 1/2] testbot/build: Always rebuild the native tools.
by Francois Gouget 30 May '18

30 May '18

It does not take long and it is actually hard to really know when to rebuild them if taking into account their libs/ and include/ dependencies. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 20 ++++++++------------ testbot/lib/WineTestBot/PatchUtils.pm | 6 +----- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 5e6b3700c..03733cef6 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -83,7 +83,7 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "Patch failed to apply\n"; - return -1; + return 0; } my $Impacts = GetPatchImpact($PatchFile, "nounits"); @@ -96,7 +96,7 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "make_makefiles failed\n"; - return -1; + return 0; } } @@ -109,11 +109,11 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "Autoconf failed\n"; - return -1; + return 0; } } - return $Impacts->{Tools}; + return 1; } my $ncpus; @@ -249,21 +249,17 @@ else FatalError "Invalid number of bits $BitIndicators\n"; } -my $NeedBuildNative = ApplyPatch($PatchFile); -if ($NeedBuildNative < 0) +if (!ApplyPatch($PatchFile)) { exit(1); } CountCPUs(); -if ($NeedBuildNative) +InfoMsg "Building tools\n"; +if (!BuildNative()) { - InfoMsg "Building tools\n"; - if (!BuildNative()) - { - exit(1); - } + exit(1); } if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32)) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 2000c9009..6c72e1639 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -142,11 +142,7 @@ sub GetPatchImpact($;$) } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { - $Impacts->{Makefiles} = $Impacts->{Tools} = 1; - } - elsif ($Line =~ m=^--- \w+/tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)$=) - { - $Impacts->{Tools} = 1; + $Impacts->{Makefiles} = 1; } elsif ($Line =~ m=^--- /dev/null$=) { -- 2.17.0

1 1

[PATCH] include: Add more definitions to wdm.h
by Alistair Leslie-Hughes 30 May '18

30 May '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/ddk/wdm.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index d6b808f..5abe18b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1408,9 +1408,12 @@ void WINAPI IoReleaseCancelSpinLock(KIRQL); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void); +void WINAPI KeInitializeSemaphore(PRKSEMAPHORE,LONG,LONG); +void WINAPI KeInitializeTimerEx(PKTIMER,TIMER_TYPE); void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); +LONG WINAPI KeReleaseMutex(PRKMUTEX,BOOLEAN); LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); LONG WINAPI KeResetEvent(PRKEVENT); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); -- 1.9.1

1 0

[PATCH v2 1/3] widl: Try to import typedefs instead of redefining them.
by Huw Davies 30 May '18

30 May '18

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/widl/write_msft.c | 69 +++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 4b09317acf..8ce34d9566 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -990,40 +990,53 @@ static int encode_type( case VT_USERDEFINED: { + importinfo_t *importinfo; int typeinfo_offset; - /* typedef'd types without public attribute aren't included in the typelib */ - while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) - type = type_alias_get_aliasee(type); + if ((importinfo = find_importinfo(typelib, type->name))) + { + chat("encode_type: VT_USERDEFINED - found imported type %s in %s\n", + type->name, importinfo->importlib->name); + alloc_importinfo(typelib, importinfo); + typeinfo_offset = importinfo->offset | 0x1; + } + else + { + /* typedef'd types without public attribute aren't included in the typelib */ + while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) + type = type_alias_get_aliasee(type); - chat("encode_type: VT_USERDEFINED - type %p name = %s real type %d idx %d\n", type, - type->name, type_get_type(type), type->typelib_idx); + chat("encode_type: VT_USERDEFINED - type %p name = %s real type %d idx %d\n", type, + type->name, type_get_type(type), type->typelib_idx); - if(type->typelib_idx == -1) { - chat("encode_type: trying to ref not added type\n"); - switch (type_get_type(type)) { - case TYPE_STRUCT: - add_structure_typeinfo(typelib, type); - break; - case TYPE_INTERFACE: - add_interface_typeinfo(typelib, type); - break; - case TYPE_ENUM: - add_enum_typeinfo(typelib, type); - break; - case TYPE_UNION: - add_union_typeinfo(typelib, type); - break; - case TYPE_COCLASS: - add_coclass_typeinfo(typelib, type); - break; - default: - error("encode_type: VT_USERDEFINED - unhandled type %d\n", - type_get_type(type)); + if (type->typelib_idx == -1) + { + chat("encode_type: trying to ref not added type\n"); + switch (type_get_type(type)) + { + case TYPE_STRUCT: + add_structure_typeinfo(typelib, type); + break; + case TYPE_INTERFACE: + add_interface_typeinfo(typelib, type); + break; + case TYPE_ENUM: + add_enum_typeinfo(typelib, type); + break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; + case TYPE_COCLASS: + add_coclass_typeinfo(typelib, type); + break; + default: + error("encode_type: VT_USERDEFINED - unhandled type %d\n", + type_get_type(type)); + } } - } - typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx]; + typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx]; + } for (typeoffset = 0; typeoffset < typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { typedata = (void *)&typelib->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; if ((typedata[0] == ((0x7fff << 16) | VT_USERDEFINED)) && (typedata[1] == typeinfo_offset)) break; -- 2.16.2

3 2

[PATCH] gameux/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 May '18

29 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gameux/tests/gameexplorer.c | 8 ++++---- dlls/gameux/tests/gamestatistics.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 05c2a1104f..0a235863bf 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -143,7 +143,7 @@ static HRESULT _buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, if(gameInstanceId) { if(SUCCEEDED(hr)) - hr = (StringFromGUID2(gameInstanceId, sInstanceId, sizeof(sInstanceId)/sizeof(sInstanceId[0])) ? S_OK : E_FAIL); + hr = (StringFromGUID2(gameInstanceId, sInstanceId, ARRAY_SIZE(sInstanceId)) ? S_OK : E_FAIL); if(SUCCEEDED(hr)) { @@ -294,7 +294,7 @@ static void _validateGameRegistryValues(int line, HRESULT hr; WCHAR sGameApplicationId[40]; - hr = (StringFromGUID2(gameApplicationId, sGameApplicationId, sizeof(sGameApplicationId)/sizeof(sGameApplicationId[0])) ? S_OK : E_FAIL); + hr = (StringFromGUID2(gameApplicationId, sGameApplicationId, ARRAY_SIZE(sGameApplicationId)) ? S_OK : E_FAIL); ok_(__FILE__, line)(hr == S_OK, "cannot convert game application id to string\n"); /* these values exist up from Vista */ @@ -547,7 +547,7 @@ static void test_add_remove_game(void) if(ge) { /* prepare path to binary */ - dwExeNameLen = GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + dwExeNameLen = GetModuleFileNameW(NULL, sExeName, ARRAY_SIZE(sExeName)); ok(dwExeNameLen != 0, "GetModuleFileNameW returned invalid value\n"); lstrcpynW(sExePath, sExeName, StrRChrW(sExeName, NULL, '\\') - sExeName + 1); bstrExeName = SysAllocString(sExeName); @@ -625,7 +625,7 @@ static void test_install_uninstall_game(void) if(ge2) { /* prepare path to binary */ - dwExeNameLen = GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + dwExeNameLen = GetModuleFileNameW(NULL, sExeName, ARRAY_SIZE(sExeName)); ok(dwExeNameLen != 0, "GetModuleFileNameW returned invalid value\n"); lstrcpynW(sExePath, sExeName, StrRChrW(sExeName, NULL, '\\') - sExeName + 1); diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index ff247fcb17..d823af1aab 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -44,7 +44,7 @@ static void test_register_game(IGameExplorer **explorer) BSTR bstrExeName, bstrExePath; /* prepare path to binary */ - GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + GetModuleFileNameW(NULL, sExeName, ARRAY_SIZE(sExeName)); lstrcpyW(pathW, sExeName); PathRemoveFileSpecW(pathW); @@ -101,7 +101,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta hr = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sPath); if(SUCCEEDED(hr)) - hr = (StringFromGUID2(guidApplicationId, sGuid, sizeof(sGuid) / sizeof(sGuid[0])) != 0 ? S_OK : E_FAIL); + hr = (StringFromGUID2(guidApplicationId, sGuid, ARRAY_SIZE(sGuid)) != 0 ? S_OK : E_FAIL); if(SUCCEEDED(hr)) { -- 2.14.3

2 1

[PATCH] wer/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 May '18

29 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wer/tests/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index b10a8191c7..11a02fb18e 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -66,7 +66,7 @@ static void test_WerAddExcludedApplication(void) ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); /* appname has a path */ - res = GetWindowsDirectoryW(buffer, sizeof(buffer) / sizeof(buffer[0])); + res = GetWindowsDirectoryW(buffer, ARRAY_SIZE(buffer)); if (res > 0) { /* the last part from the path is added to the inclusion list */ hr = WerAddExcludedApplication(buffer, FALSE); @@ -118,7 +118,7 @@ static void test_WerRemoveExcludedApplication(void) "got 0x%x (expected E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))\n", hr); /* appname has a path */ - res = GetWindowsDirectoryW(buffer, sizeof(buffer) / sizeof(buffer[0])); + res = GetWindowsDirectoryW(buffer, ARRAY_SIZE(buffer)); if (res > 0) { hr = WerRemoveExcludedApplication(buffer, FALSE); ok((hr == E_FAIL) || (hr == __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND)), @@ -223,7 +223,7 @@ static void test_WerReportCreate(void) /* multiple active reports are possible */ memset(table, 0, sizeof(table)); - for (i = 0; i < (sizeof(table) / sizeof(table[0]) -1); i++) { + for (i = 0; i < (ARRAY_SIZE(table) - 1); i++) { report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, WerReportCritical, NULL, &table[i]); ok(hr == S_OK, "%02d: got 0x%x and %p (expected S_OK)\n", i, hr, table[i]); -- 2.14.3

1 0

[PATCH] xinput/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 May '18

29 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index f26fda90eb..e5eb504d52 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -292,7 +292,7 @@ START_TEST(xinput) void *pXInputGetStateEx_Ordinal; int i; - for (i = 0; i < sizeof(libs) / sizeof(libs[0]); i++) + for (i = 0; i < ARRAY_SIZE(libs); i++) { hXinput = LoadLibraryA( libs[i].name ); -- 2.14.3

1 0

[PATCH] wintrust/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 May '18

29 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 6e7913f710..81153a28cc 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -287,7 +287,7 @@ static HANDLE create_temp_file(WCHAR *temp_file) HANDLE file = INVALID_HANDLE_VALUE; WCHAR temp_path[MAX_PATH]; - if (GetTempPathW(sizeof(temp_path) / sizeof(temp_path[0]), temp_path)) + if (GetTempPathW(ARRAY_SIZE(temp_path), temp_path)) { static const WCHAR img[] = { 'i','m','g',0 }; -- 2.14.3

1 0

[PATCH] mlang/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 May '18

29 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mlang/tests/mlang.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index bcb2fd07db..b5d6fc6114 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -577,7 +577,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) memset(bufW, 'x', sizeof(bufW)); lenA = 0; - lenW = sizeof(bufW)/sizeof(bufW[0]); + lenW = ARRAY_SIZE(bufW); ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, 1252, stringA, &lenA, bufW, &lenW); ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); ok(lenA == 0, "expected lenA 0, got %u\n", lenA); @@ -585,12 +585,12 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) memset(bufW, 'x', sizeof(bufW)); lenA = -1; - lenW = sizeof(bufW)/sizeof(bufW[0]); + lenW = ARRAY_SIZE(bufW); ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, 1252, stringA, &lenA, bufW, &lenW); ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); ok(lenW == lstrlenW(stringW), "expected lenW %u, got %u\n", lstrlenW(stringW), lenW); - if (lenW < sizeof(bufW)/sizeof(bufW[0])) { + if (lenW < ARRAY_SIZE(bufW)) { /* can only happen if the convert call fails */ ok(bufW[lenW] != 0, "buf should not be 0 terminated\n"); bufW[lenW] = 0; /* -1 doesn't include 0 terminator */ @@ -608,7 +608,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) memset(bufW, 'x', sizeof(bufW)); lenA = -1; - lenW = sizeof(bufW)/sizeof(bufW[0]); + lenW = ARRAY_SIZE(bufW); ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, CP_UNICODE, stringA, &lenA, bufW, &lenW); ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); @@ -628,7 +628,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) memset(bufW, 'x', sizeof(bufW)); lenA = lstrlenA(stringA); - lenW = sizeof(bufW)/sizeof(bufW[0]); + lenW = ARRAY_SIZE(bufW); ret = pConvertINetMultiByteToUnicode(NULL, 1252, stringA, (INT *)&lenA, NULL, (INT *)&lenW); ok(ret == S_OK, "ConvertINetMultiByteToUnicode failed: %08x\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); @@ -1039,7 +1039,7 @@ static void test_GetCharsetInfo_other(IMultiLanguage *ml) HRESULT hr; int i; - for (i = 0; i < sizeof(other)/sizeof(*other); i++) + for (i = 0; i < ARRAY_SIZE(other); i++) { hr = IMultiLanguage_GetCharsetInfo(ml, other[i].charset, &info); @@ -1356,7 +1356,7 @@ static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) static WCHAR english[] = { 'e','n','g','l','i','s','h',0 }; - for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(lcid_table); i++) { lcid = -1; MultiByteToWideChar(CP_ACP, 0, lcid_table[i].rfc1766, -1, rfc1766W, MAX_RFC1766_NAME); ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, rfc1766W); @@ -1410,7 +1410,7 @@ static void test_Rfc1766ToLcid(void) HRESULT ret; DWORD i; - for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(lcid_table); i++) { lcid = -1; ret = pRfc1766ToLcidA(&lcid, lcid_table[i].rfc1766); @@ -1454,7 +1454,7 @@ static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) HRESULT hr; BSTR rfcstr; - for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(lcid_table); i++) { buffer[0] = '\0'; rfcstr = NULL; @@ -1488,7 +1488,7 @@ static void test_LcidToRfc1766(void) HRESULT hr; DWORD i; - for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(lcid_table); i++) { memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; @@ -1542,7 +1542,7 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) HRESULT ret; DWORD i; - for(i = 0; i < sizeof(info_table) / sizeof(info_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(info_table); i++) { memset(buffer, 'x', sizeof(RFC1766INFO) + 2); buffer[sizeof(buffer) -1] = 0; buffer[sizeof(buffer) -2] = 0; @@ -2167,7 +2167,7 @@ static void test_CodePageToScriptID(IMLangFontLink2 *font_link) {CP_UNICODE, 0, E_FAIL} }; - for (i = 0; i < sizeof(cp_sid)/sizeof(cp_sid[0]); i++) + for (i = 0; i < ARRAY_SIZE(cp_sid); i++) { hr = IMLangFontLink2_CodePageToScriptID(font_link, cp_sid[i].cp, &sid); ok(hr == cp_sid[i].hr, "%u CodePageToScriptID failed 0x%08x %u\n", i, hr, GetLastError()); @@ -2460,21 +2460,21 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == E_INVALIDARG, "got %08x\n", hr); nb_detected = 1; memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), NULL, &nb_detected, NULL); + ARRAY_SIZE(preferred), NULL, &nb_detected, NULL); ok(hr == E_INVALIDARG, "got %08x\n", hr); nb_detected = 1; memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); ok(nb_detected == 1, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2483,7 +2483,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(nb_detected == 2, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2493,7 +2493,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2504,7 +2504,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2516,7 +2516,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred2, - sizeof(preferred2)/sizeof(preferred2[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred2), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2536,7 +2536,7 @@ static void test_GetCodePageInfo(IMultiLanguage2 *iML2) HRESULT ret; test_data = iml2_cpinfo_data; - test_data_num = sizeof(iml2_cpinfo_data) / sizeof(iml2_cpinfo_data[0]); + test_data_num = ARRAY_SIZE(iml2_cpinfo_data); for (i = 0; i < test_data_num; i++) { ret = IMultiLanguage2_GetCodePageInfo(iML2, test_data[i].cpinfo.uiCodePage, LANG_NEUTRAL, &cpinfo); -- 2.14.3

1 0

[PATCH] evr/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 May '18

29 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/evr/tests/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/tests/filter.c b/dlls/evr/tests/filter.c index 3bae738f5f..84fff6df82 100644 --- a/dlls/evr/tests/filter.c +++ b/dlls/evr/tests/filter.c @@ -163,7 +163,7 @@ static void test_evr_filter_aggregations(void) }; int i; - for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + for (i = 0; i < ARRAY_SIZE(iids); i++) { test_aggregation(CLSID_EnhancedVideoRenderer, *iids[i], "filter", i); } -- 2.14.3

1 0

[PATCH] dxdiagn/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 May '18

29 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxdiagn/tests/container.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index e5afba7028..936707632a 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -158,7 +158,7 @@ static void test_EnumChildContainerNames(void) ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); - hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, NULL, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, NULL, ARRAY_SIZE(container)); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); @@ -178,7 +178,7 @@ static void test_EnumChildContainerNames(void) "Expected the container buffer to be untouched, got %s\n", wine_dbgstr_w(container)); memcpy(container, testW, sizeof(testW)); - hr = IDxDiagContainer_EnumChildContainerNames(pddc, ~0, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, ~0, container, ARRAY_SIZE(container)); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); ok(!memcmp(container, zerotestW, sizeof(zerotestW)), @@ -221,7 +221,7 @@ static void test_EnumChildContainerNames(void) "Expected the container buffer string to be empty, got %s\n", wine_dbgstr_w(container)); /* Get the container name to compare against. */ - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, temp, sizeof(temp)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, temp, ARRAY_SIZE(temp)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); @@ -293,7 +293,7 @@ static void test_GetChildContainer(void) ok(child == NULL, "Expected output pointer to be NULL, got %p\n", child); /* Get the name of a suitable child container. */ - hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, container, ARRAY_SIZE(container)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); if (FAILED(hr)) @@ -367,7 +367,7 @@ static void test_dot_parsing(void) { IDxDiagContainer *child; - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, containerbufW, sizeof(containerbufW)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, containerbufW, ARRAY_SIZE(containerbufW)); ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); if (FAILED(hr)) { @@ -380,7 +380,7 @@ static void test_dot_parsing(void) if (SUCCEEDED(hr)) { - hr = IDxDiagContainer_EnumChildContainerNames(child, 0, childbufW, sizeof(childbufW)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(child, 0, childbufW, ARRAY_SIZE(childbufW)); ok(hr == S_OK || hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK or E_INVALIDARG, got 0x%08x\n", hr); IDxDiagContainer_Release(child); @@ -399,7 +399,7 @@ static void test_dot_parsing(void) trace("Testing IDxDiagContainer::GetChildContainer dot parsing with container %s and child container %s.\n", wine_dbgstr_w(containerbufW), wine_dbgstr_w(childbufW)); - for (i = 0; i < sizeof(test_strings)/sizeof(test_strings[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_strings); i++) { IDxDiagContainer *child; char containerbufA[256]; @@ -410,7 +410,7 @@ static void test_dot_parsing(void) WideCharToMultiByte(CP_ACP, 0, containerbufW, -1, containerbufA, sizeof(containerbufA), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, childbufW, -1, childbufA, sizeof(childbufA), NULL, NULL); sprintf(dotbufferA, test_strings[i].format, containerbufA, childbufA); - MultiByteToWideChar(CP_ACP, 0, dotbufferA, -1, dotbufferW, sizeof(dotbufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, dotbufferA, -1, dotbufferW, ARRAY_SIZE(dotbufferW)); trace("Trying container name %s\n", wine_dbgstr_w(dotbufferW)); hr = IDxDiagContainer_GetChildContainer(pddc, dotbufferW, &child); @@ -451,7 +451,7 @@ static void test_EnumPropNames(void) for (index = 0; index < count; index++) { - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, ARRAY_SIZE(container)); ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); if (FAILED(hr)) { @@ -493,7 +493,7 @@ static void test_EnumPropNames(void) "Expected the property buffer to be unchanged, got %s\n", wine_dbgstr_w(property)); memcpy(property, testW, sizeof(testW)); - hr = IDxDiagContainer_EnumPropNames(child, ~0, property, sizeof(property)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumPropNames(child, ~0, property, ARRAY_SIZE(property)); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumPropNames to return E_INVALIDARG, got 0x%08x\n", hr); ok(!memcmp(property, testW, sizeof(testW)), "Expected the property buffer to be unchanged, got %s\n", wine_dbgstr_w(property)); @@ -526,7 +526,7 @@ static void test_EnumPropNames(void) ok(property[0] == '\0', "Expected the property buffer string to be empty, got %s\n", wine_dbgstr_w(property)); - hr = IDxDiagContainer_EnumPropNames(child, index, temp, sizeof(temp)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumPropNames(child, index, temp, ARRAY_SIZE(temp)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumPropNames to return S_OK, got 0x%08x\n", hr); @@ -596,7 +596,7 @@ static void test_GetProp(void) for (index = 0; index < count; index++) { - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, ARRAY_SIZE(container)); ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); if (FAILED(hr)) { @@ -609,7 +609,7 @@ static void test_GetProp(void) if (SUCCEEDED(hr)) { - hr = IDxDiagContainer_EnumPropNames(child, 0, property, sizeof(property)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumPropNames(child, 0, property, ARRAY_SIZE(property)); ok(hr == S_OK || hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumPropNames to return S_OK or E_INVALIDARG, got 0x%08x\n", hr); @@ -745,10 +745,10 @@ static void test_root_children(void) goto cleanup; } - ok(count == sizeof(root_children)/sizeof(root_children[0]), + ok(count == ARRAY_SIZE(root_children), "Got unexpected count %u for the number of child containers\n", count); - if (count != sizeof(root_children)/sizeof(root_children[0])) + if (count != ARRAY_SIZE(root_children)) { skip("Received unexpected number of child containers\n"); goto cleanup; @@ -758,7 +758,7 @@ static void test_root_children(void) { WCHAR container[256]; - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, ARRAY_SIZE(container)); if (hr == E_INVALIDARG) { ok(index == count, @@ -911,7 +911,7 @@ static void test_DxDiag_SystemInfo(void) if (hr == S_OK) { trace("Testing container DxDiag_SystemInfo\n"); - test_container_properties(container, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + test_container_properties(container, property_tests, ARRAY_SIZE(property_tests)); IDxDiagContainer_Release(container); } @@ -1002,7 +1002,7 @@ static void test_DxDiag_DisplayDevices(void) WCHAR child_container[256]; IDxDiagContainer *child; - hr = IDxDiagContainer_EnumChildContainerNames(display_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(display_cont, i, child_container, ARRAY_SIZE(child_container)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); hr = IDxDiagContainer_GetChildContainer(display_cont, child_container, &child); @@ -1011,7 +1011,7 @@ static void test_DxDiag_DisplayDevices(void) if (hr == S_OK) { trace("Testing container %s\n", wine_dbgstr_w(child_container)); - test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + test_container_properties(child, property_tests, ARRAY_SIZE(property_tests)); } IDxDiagContainer_Release(child); } -- 2.14.3

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 29 May '18

29 May '18

1 0

[PATCH] include: Add ID2D1DeviceContext definition.
by Henri Verbeet 29 May '18

29 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/d2d1_1.idl | 284 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/dcommon.idl | 16 +++ 2 files changed, 300 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 4b6224afe3b..11182263103 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -27,7 +27,18 @@ interface ID2D1Properties; interface IPrintDocumentPackageTarget; interface ID2D1PrintControl; interface IWICImagingFactory; +interface IWICColorContext; interface ID2D1ColorContext; +interface ID2D1Effect; +interface ID2D1GradientStopCollection1; +interface ID2D1ImageBrush; +interface ID2D1BitmapBrush1; +interface ID2D1CommandList; + +cpp_quote("#ifndef __dwrite_h__") +/* already defined in dwrite.h but needed for WIDL */ +typedef struct DWRITE_GLYPH_RUN_DESCRIPTION DWRITE_GLYPH_RUN_DESCRIPTION; +cpp_quote("#endif /* __dwrite_h__ */") typedef enum D2D1_DEVICE_CONTEXT_OPTIONS { @@ -96,7 +107,63 @@ typedef enum D2D1_MAP_OPTIONS D2D1_MAP_OPTIONS_FORCE_DWORD = 0xffffffff, } D2D1_MAP_OPTIONS; +typedef enum D2D1_BUFFER_PRECISION +{ + D2D1_BUFFER_PRECISION_UNKNOWN = 0x0, + D2D1_BUFFER_PRECISION_8BPC_UNORM = 0x1, + D2D1_BUFFER_PRECISION_8BPC_UNORM_SRGB = 0x2, + D2D1_BUFFER_PRECISION_16BPC_UNORM = 0x3, + D2D1_BUFFER_PRECISION_16BPC_FLOAT = 0x4, + D2D1_BUFFER_PRECISION_32BPC_FLOAT = 0x5, + D2D1_BUFFER_PRECISION_FORCE_DWORD = 0xffffffff, +} D2D1_BUFFER_PRECISION; + +typedef enum D2D1_COLOR_INTERPOLATION_MODE +{ + D2D1_COLOR_INTERPOLATION_MODE_STRAIGHT = 0x0, + D2D1_COLOR_INTERPOLATION_MODE_PREMULTIPLIED = 0x1, + D2D1_COLOR_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_INTERPOLATION_MODE; + +typedef enum D2D1_INTERPOLATION_MODE +{ + D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR, + D2D1_INTERPOLATION_MODE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR, + D2D1_INTERPOLATION_MODE_CUBIC = D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC, + D2D1_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR, + D2D1_INTERPOLATION_MODE_ANISOTROPIC = D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC, + D2D1_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC, + D2D1_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_INTERPOLATION_MODE; + +typedef enum D2D1_COMPOSITE_MODE +{ + D2D1_COMPOSITE_MODE_SOURCE_OVER = 0x0, + D2D1_COMPOSITE_MODE_DESTINATION_OVER = 0x1, + D2D1_COMPOSITE_MODE_SOURCE_IN = 0x2, + D2D1_COMPOSITE_MODE_DESTINATION_IN = 0x3, + D2D1_COMPOSITE_MODE_SOURCE_OUT = 0x4, + D2D1_COMPOSITE_MODE_DESTINATION_OUT = 0x5, + D2D1_COMPOSITE_MODE_SOURCE_ATOP = 0x6, + D2D1_COMPOSITE_MODE_DESTINATION_ATOP = 0x7, + D2D1_COMPOSITE_MODE_XOR = 0x8, + D2D1_COMPOSITE_MODE_PLUS = 0x9, + D2D1_COMPOSITE_MODE_SOURCE_COPY = 0xa, + D2D1_COMPOSITE_MODE_BOUNDED_SOURCE_COPY = 0xb, + D2D1_COMPOSITE_MODE_MASK_INVERT = 0xc, + D2D1_COMPOSITE_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COMPOSITE_MODE; + +typedef enum D2D1_LAYER_OPTIONS1 +{ + D2D1_LAYER_OPTIONS1_NONE = 0x0, + D2D1_LAYER_OPTIONS1_INITIALIZE_FROM_BACKGROUND = 0x1, + D2D1_LAYER_OPTIONS1_IGNORE_ALPHA = 0x2, + D2D1_LAYER_OPTIONS1_FORCE_DWORD = 0xffffffff, +} D2D1_LAYER_OPTIONS1; + typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; +typedef D2D_MATRIX_4X4_F D2D1_MATRIX_4X4_F; typedef struct D2D1_STROKE_STYLE_PROPERTIES1 { @@ -134,6 +201,54 @@ typedef struct D2D1_MAPPED_RECT BYTE *bits; } D2D1_MAPPED_RECT; +typedef struct D2D1_BITMAP_PROPERTIES1 +{ + D2D1_PIXEL_FORMAT pixelFormat; + float dpiX; + float dpiY; + D2D1_BITMAP_OPTIONS bitmapOptions; + ID2D1ColorContext *colorContext; +} D2D1_BITMAP_PROPERTIES1; + +typedef struct D2D1_IMAGE_BRUSH_PROPERTIES +{ + D2D1_RECT_F sourceRectangle; + D2D1_EXTEND_MODE extendModeX; + D2D1_EXTEND_MODE extendModeY; + D2D1_INTERPOLATION_MODE interpolationMode; +} D2D1_IMAGE_BRUSH_PROPERTIES; + +typedef struct D2D1_BITMAP_BRUSH_PROPERTIES1 +{ + D2D1_EXTEND_MODE extendModeX; + D2D1_EXTEND_MODE extendModeY; + D2D1_INTERPOLATION_MODE interpolationMode; +} D2D1_BITMAP_BRUSH_PROPERTIES1; + +typedef struct D2D1_RENDERING_CONTROLS +{ + D2D1_BUFFER_PRECISION bufferPrecision; + D2D1_SIZE_U tileSize; +} D2D1_RENDERING_CONTROLS; + +typedef struct D2D1_LAYER_PARAMETERS1 +{ + D2D1_RECT_F contentBounds; + ID2D1Geometry *geometricMask; + D2D1_ANTIALIAS_MODE maskAntialiasMode; + D2D1_MATRIX_3X2_F maskTransform; + float opacity; + ID2D1Brush *opacityBrush; + D2D1_LAYER_OPTIONS1 layerOptions; +} D2D1_LAYER_PARAMETERS1; + +typedef struct D2D1_EFFECT_INPUT_DESCRIPTION +{ + ID2D1Effect *effect; + UINT32 inputIndex; + D2D1_RECT_F inputRectangle; +} D2D1_EFFECT_INPUT_DESCRIPTION; + typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [ @@ -185,6 +300,175 @@ interface ID2D1Device : ID2D1Resource [ object, + uuid(e8f7fe7a-191c-466d-ad95-975678bda998), + local, +] +interface ID2D1DeviceContext : ID2D1RenderTarget +{ + HRESULT CreateBitmap( + [in] D2D1_SIZE_U size, + [in] const void *src_data, + [in] UINT32 pitch, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateBitmapFromWicBitmap( + [in] IWICBitmapSource *bitmap_source, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateColorContext( + [in] D2D1_COLOR_SPACE space, + [in] const BYTE *profile, + [in] UINT32 profile_size, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromFilename( + [in] const WCHAR *filename, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromWicColorContext( + [in] IWICColorContext *wic_color_context, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateBitmapFromDxgiSurface( + [in] IDXGISurface *surface, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateEffect( + [in] REFCLSID effect_id, + [out] ID2D1Effect **effect + ); + HRESULT CreateGradientStopCollection( + [in] const D2D1_GRADIENT_STOP *stops, + [in] UINT32 stop_count, + [in] D2D1_COLOR_SPACE preinterpolation_space, + [in] D2D1_COLOR_SPACE postinterpolation_space, + [in] D2D1_BUFFER_PRECISION buffer_precision, + [in] D2D1_EXTEND_MODE extend_mode, + [in] D2D1_COLOR_INTERPOLATION_MODE color_interpolation_mode, + [out] ID2D1GradientStopCollection1 **gradient + ); + HRESULT CreateImageBrush( + [in] ID2D1Image *image, + [in] const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, + [in] const D2D1_BRUSH_PROPERTIES *brush_desc, + [out] ID2D1ImageBrush **brush + ); + HRESULT CreateBitmapBrush( + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, + [in] const D2D1_BRUSH_PROPERTIES *brush_desc, + [out] ID2D1BitmapBrush1 **bitmap_brush + ); + HRESULT CreateCommandList( + [out] ID2D1CommandList **command_list + ); + BOOL IsDxgiFormatSupported( + [in] DXGI_FORMAT format + ); + BOOL IsBufferPrecisionSupported( + [in] D2D1_BUFFER_PRECISION buffer_precision + ); + void GetImageLocalBounds( + [in] ID2D1Image *image, + [out] D2D1_RECT_F *local_bounds + ); + HRESULT GetImageWorldBounds( + [in] ID2D1Image *image, + [out] D2D1_RECT_F *world_bounds + ); + HRESULT GetGlyphRunWorldBounds( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] DWRITE_MEASURING_MODE measuring_mode, + [out] D2D1_RECT_F *bounds + ); + void GetDevice( + [out] ID2D1Device **device + ); + void SetTarget( + [in] ID2D1Image *target + ); + void GetTarget( + [out] ID2D1Image **target + ); + void SetRenderingControls( + [in] const D2D1_RENDERING_CONTROLS *rendering_controls + ); + void GetRenderingControls( + [out] D2D1_RENDERING_CONTROLS *rendering_controls + ); + void SetPrimitiveBlend( + [in] D2D1_PRIMITIVE_BLEND primitive_blend + ); + D2D1_PRIMITIVE_BLEND GetPrimitiveBlend(); + void SetUnitMode( + [in] D2D1_UNIT_MODE unit_mode + ); + D2D1_UNIT_MODE GetUnitMode(); + void DrawGlyphRun( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] const DWRITE_GLYPH_RUN_DESCRIPTION *glyph_run_desc, + [in] ID2D1Brush *brush, + [in] DWRITE_MEASURING_MODE measuring_mode + ); + void DrawImage( + [in] ID2D1Image *image, + [in] const D2D1_POINT_2F *target_offset, + [in] const D2D1_RECT_F *image_rect, + [in] D2D1_INTERPOLATION_MODE interpolation_mode, + [in] D2D1_COMPOSITE_MODE composite_mode + ); + void DrawGdiMetafile( + [in] ID2D1GdiMetafile *metafile, + [in] const D2D1_POINT_2F *target_offset + ); + void DrawBitmap( + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_RECT_F *dst_rect, + [in] float opacity, + [in] D2D1_INTERPOLATION_MODE interpolation_mode, + [in] const D2D1_RECT_F *src_rect, + [in] const D2D1_MATRIX_4X4_F *perspective_transform + ); + void PushLayer( + [in] const D2D1_LAYER_PARAMETERS1 *layer_parameters, + [in] ID2D1Layer *layer + ); + HRESULT InvalidateEffectInputRectangle( + [in] ID2D1Effect *effect, + [in] UINT32 input, + [in] const D2D1_RECT_F *input_rect + ); + HRESULT GetEffectInvalidRectangleCount( + [in] ID2D1Effect *effect, + [out] UINT32 *rect_count + ); + HRESULT GetEffectInvalidRectangles( + [in] ID2D1Effect *effect, + [out] D2D1_RECT_F *rectangles, + [in] UINT32 rect_count + ); + HRESULT GetEffectRequiredInputRectangles( + [in] ID2D1Effect *effect, + [in] const D2D1_RECT_F *image_rect, + [in] const D2D1_EFFECT_INPUT_DESCRIPTION *desc, + [out] D2D1_RECT_F *input_rect, + [in] UINT32 input_count + ); + void FillOpacityMask( + [in] ID2D1Bitmap *mask, + [in] ID2D1Brush *brush, + [in] const D2D1_RECT_F *dst_rect, + [in] const D2D1_RECT_F *src_rect + ); +} + +[ + object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), local, ] diff --git a/include/dcommon.idl b/include/dcommon.idl index db5055d202e..88f97c56a47 100644 --- a/include/dcommon.idl +++ b/include/dcommon.idl @@ -61,3 +61,19 @@ typedef struct D2D_SIZE_U UINT32 width; UINT32 height; } D2D_SIZE_U, D2D1_SIZE_U; + +typedef struct D2D_MATRIX_4X4_F +{ + union + { + struct + { + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; + }; + + float m[4][4]; + }; +} D2D_MATRIX_4X4_F; -- 2.11.0

1 0

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-devel