December 2019 - Wine-devel - list.winehq.org

[PATCH] testbotWineRunReconfig: Fix formatting of a trace.
by Francois Gouget 02 Dec '19

02 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 5c7b46bb9..985d9312e 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -503,7 +503,7 @@ if ($NewStatus eq "completed") my $ErrMessage = $TA->GetLastError(); FatalError("Could not connect to the new ". $VM->Name ." TestAgent: $ErrMessage\n"); } - Debug(Elapsed($Start), "Upgraded testagentd to $Version\n"); + Debug(Elapsed($Start), " Upgraded testagentd to $Version\n"); } } -- 2.20.1

1 0

[PATCH] testbot: Fix the VM Missions validation.
by Francois Gouget 02 Dec '19

02 Dec '19

$Item->Xxx("foo") does not go through PutColValue()! Instead AUTOLOAD sets the specified property directly, maybe fori performance reasons, and PutColValue() is only used by DBIBackend.pm. WineTestBot::VMs was overriding PutColValue() to only revalidate a VM's missions field if either the VM Type of Missions field were modified. But instead ValidateMissions was always true after loading a VM from the database (because of the PutColValue() calls), and not when creating a new VM (in which case all the properties are set through AUTOLOAD). So take a snapshot of the initial Type and Missions values when the database code resets the IsModified field by calling ResetModified(); and then revalidate them whenever they have changed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 37ebf9a62..279b7bccd 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -304,15 +304,13 @@ sub KillChild($) $self->ChildPid(undef); } -sub PutColValue($$$) +sub ResetModified($) { - my ($self, $ColName, $Value) = @_; + my ($self) = @_; - $self->SUPER::PutColValue($ColName, $Value); - if ($self->{IsModified} and ($ColName eq "Type" or $ColName eq "Missions")) - { - $self->{ValidateMissions} = 1; - } + $self->SUPER::ResetModified(); + $self->{OldType} = $self->Type; + $self->{OldMissions} = $self->Missions; } my $_SupportedMissions = { @@ -331,7 +329,8 @@ sub Validate($) { return ("Role", "Only win32, win64 and wine VMs can have a role of '" . $self->Role . "'"); } - if ($self->{ValidateMissions}) + if ($self->ValuesDiffer($self->{OldType}, $self->Type) or + $self->ValuesDiffer($self->{OldMissions}, $self->Missions)) { my ($ErrMessage, $Missions) = ParseMissionStatement($self->Missions); return ("Missions", $ErrMessage) if (defined $ErrMessage); @@ -350,7 +349,8 @@ sub Validate($) } } } - delete $self->{ValidateMissions}; + $self->{OldType} = $self->Type; + $self->{OldMissions} = $self->Missions; } return $self->SUPER::Validate(); -- 2.20.1

1 0

[PATCH v2 3/3] wined3d: Check dirty region dimensions.
by Akihiro Sagawa 02 Dec '19

02 Dec '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/texture.c | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[PATCH v2 2/3] d3d8/tests: Add out-of-bounds region tests.
by Akihiro Sagawa 02 Dec '19

02 Dec '19

In v2, fix todo_wine keyword position. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/d3d8/tests/visual.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)

1 0

[PATCH v2 1/3] d3d9/tests: Add out-of-bounds region tests.
by Akihiro Sagawa 02 Dec '19

02 Dec '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/d3d9/tests/visual.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)

1 0

[PATCH 4/4] wusa: Install updates.
by Hans Leidekker 02 Dec '19

02 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/wusa/Makefile.in | 2 +- programs/wusa/main.c | 562 ++++++++++++++++++++++++++++++++++++++ programs/wusa/wusa.h | 19 ++ 3 files changed, 582 insertions(+), 1 deletion(-) diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index 87bfe1dae0..4167747ffc 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,5 +1,5 @@ MODULE = wusa.exe -IMPORTS = cabinet shlwapi ole32 oleaut32 +IMPORTS = cabinet shlwapi ole32 oleaut32 advapi32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 8df8731e2b..49e7dc7530 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -29,6 +29,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wusa); +struct strbuf +{ + WCHAR *buf; + DWORD pos; + DWORD len; +}; + struct installer_tempdir { struct list entry; @@ -394,6 +401,508 @@ static BOOL load_assemblies_from_cab(const WCHAR *filename, struct installer_sta return TRUE; } +static BOOL compare_assembly_string(const WCHAR *str1, const WCHAR *str2) +{ + return !wcscmp(str1, str2) || !wcscmp(str1, L"*") || !wcscmp(str2, L"*"); +} + +static struct assembly_entry *lookup_assembly(struct list *manifest_list, struct assembly_identity *identity) +{ + struct assembly_entry *assembly; + + LIST_FOR_EACH_ENTRY(assembly, manifest_list, struct assembly_entry, entry) + { + if (wcsicmp(assembly->identity.name, identity->name)) continue; + if (!compare_assembly_string(assembly->identity.architecture, identity->architecture)) continue; + if (!compare_assembly_string(assembly->identity.language, identity->language)) continue; + if (!compare_assembly_string(assembly->identity.pubkey_token, identity->pubkey_token)) continue; + if (!compare_assembly_string(assembly->identity.version, identity->version)) + { + WARN("Ignoring version difference for %s (expected %s, found %s)\n", + debugstr_w(identity->name), debugstr_w(identity->version), debugstr_w(assembly->identity.version)); + } + return assembly; + } + + return NULL; +} + +static WCHAR *get_assembly_source(struct assembly_entry *assembly) +{ + WCHAR *p, *path = strdupW(assembly->filename); + if (path && (p = wcsrchr(path, '.'))) *p = 0; + return path; +} + +static BOOL strbuf_init(struct strbuf *buf) +{ + buf->pos = 0; + buf->len = 64; + buf->buf = heap_alloc(buf->len * sizeof(WCHAR)); + return buf->buf != NULL; +} + +static void strbuf_free(struct strbuf *buf) +{ + heap_free(buf->buf); + buf->buf = NULL; +} + +static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) +{ + DWORD new_len; + WCHAR *new_buf; + + if (!buf->buf) return FALSE; + if (!str) return TRUE; + + if (len == ~0U) len = lstrlenW(str); + if (buf->pos + len + 1 > buf->len) + { + new_len = max(buf->pos + len + 1, buf->len * 2); + new_buf = heap_realloc(buf->buf, new_len * sizeof(WCHAR)); + if (!new_buf) + { + strbuf_free(buf); + return FALSE; + } + buf->buf = new_buf; + buf->len = new_len; + } + + memcpy(&buf->buf[buf->pos], str, len * sizeof(WCHAR)); + buf->buf[buf->pos + len] = 0; + buf->pos += len; + return TRUE; +} + +static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *key) +{ + WCHAR path[MAX_PATH]; + + if (!wcscmp(key, L"runtime.system32")) + { +#ifdef __x86_64__ + if (!wcscmp(assembly->identity.architecture, L"x86")) + { + GetSystemWow64DirectoryW(path, ARRAY_SIZE(path)); + return strdupW(path); + } +#endif + GetSystemDirectoryW(path, ARRAY_SIZE(path)); + return strdupW(path); + } + if (!wcscmp(key, L"runtime.windows")) + { + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + return strdupW(path); + } + + FIXME("Unknown expression %s\n", debugstr_w(key)); + return NULL; +} + +static WCHAR *expand_expression(struct assembly_entry *assembly, const WCHAR *expression) +{ + const WCHAR *pos, *next; + WCHAR *key, *value; + struct strbuf buf; + + if (!expression || !strbuf_init(&buf)) return NULL; + + for (pos = expression; (next = wcsstr(pos, L"$(")); pos = next + 1) + { + strbuf_append(&buf, pos, next - pos); + pos = next + 2; + if (!(next = wcsstr(pos, L")"))) + { + strbuf_append(&buf, L"$(", 2); + break; + } + + if (!(key = strdupWn(pos, next - pos))) goto error; + value = lookup_expression(assembly, key); + heap_free(key); + if (!value) goto error; + strbuf_append(&buf, value, ~0U); + heap_free(value); + } + + strbuf_append(&buf, pos, ~0U); + return buf.buf; + +error: + FIXME("Couldn't resolve expression %s\n", debugstr_w(expression)); + strbuf_free(&buf); + return NULL; +} + +static BOOL install_files_copy(struct assembly_entry *assembly, const WCHAR *source_path, struct fileop_entry *fileop, BOOL dryrun) +{ + WCHAR *target_path, *target, *source = NULL; + BOOL ret = FALSE; + + if (!(target_path = expand_expression(assembly, fileop->target))) return FALSE; + if (!(target = path_combine(target_path, fileop->source))) goto error; + if (!(source = path_combine(source_path, fileop->source))) goto error; + + if (dryrun) + { + if (!(ret = PathFileExistsW(source))) + { + ERR("Required file %s not found\n", debugstr_w(source)); + goto error; + } + } + else + { + TRACE("Copying %s -> %s\n", debugstr_w(source), debugstr_w(target)); + + if (!create_parent_directory(target)) + { + ERR("Failed to create parent directory for %s\n", debugstr_w(target)); + goto error; + } + if (!(ret = CopyFileExW(source, target, NULL, NULL, NULL, 0))) + { + ERR("Failed to copy %s to %s\n", debugstr_w(source), debugstr_w(target)); + goto error; + } + } + +error: + heap_free(target_path); + heap_free(target); + heap_free(source); + return ret; +} + +static BOOL install_files(struct assembly_entry *assembly, BOOL dryrun) +{ + struct fileop_entry *fileop; + WCHAR *source_path; + BOOL ret = TRUE; + + if (!(source_path = get_assembly_source(assembly))) + { + ERR("Failed to get assembly source directory\n"); + return FALSE; + } + + LIST_FOR_EACH_ENTRY(fileop, &assembly->fileops, struct fileop_entry, entry) + { + if (!(ret = install_files_copy(assembly, source_path, fileop, dryrun))) break; + } + + heap_free(source_path); + return ret; +} + +static WCHAR *split_registry_key(WCHAR *key, HKEY *root) +{ + DWORD size; + WCHAR *p; + + if (!(p = wcschr(key, '\\'))) return NULL; + size = p - key; + + if (lstrlenW(L"HKEY_CLASSES_ROOT") == size && !wcsncmp(key, L"HKEY_CLASSES_ROOT", size)) + *root = HKEY_CLASSES_ROOT; + else if (lstrlenW(L"HKEY_CURRENT_CONFIG") == size && !wcsncmp(key, L"HKEY_CURRENT_CONFIG", size)) + *root = HKEY_CURRENT_CONFIG; + else if (lstrlenW(L"HKEY_CURRENT_USER") == size && !wcsncmp(key, L"HKEY_CURRENT_USER", size)) + *root = HKEY_CURRENT_USER; + else if (lstrlenW(L"HKEY_LOCAL_MACHINE") == size && !wcsncmp(key, L"HKEY_LOCAL_MACHINE", size)) + *root = HKEY_LOCAL_MACHINE; + else if (lstrlenW(L"HKEY_USERS") == size && !wcsncmp(key, L"HKEY_USERS", size)) + *root = HKEY_USERS; + else + { + FIXME("Unknown root key %s\n", debugstr_wn(key, size)); + return NULL; + } + + return p + 1; +} + +static BOOL install_registry_string(struct assembly_entry *assembly, HKEY key, struct registrykv_entry *registrykv, DWORD type, BOOL dryrun) +{ + DWORD value_size; + WCHAR *value = expand_expression(assembly, registrykv->value); + BOOL ret = TRUE; + + if (registrykv->value && !value) + return FALSE; + + value_size = value ? (lstrlenW(value) + 1) * sizeof(WCHAR) : 0; + if (!dryrun && RegSetValueExW(key, registrykv->name, 0, type, (void *)value, value_size)) + { + ERR("Failed to set registry key %s\n", debugstr_w(registrykv->name)); + ret = FALSE; + } + + heap_free(value); + return ret; +} + +static WCHAR *parse_multisz(const WCHAR *input, DWORD *size) +{ + const WCHAR *pos, *next; + struct strbuf buf; + + *size = 0; + if (!input || !input[0] || !strbuf_init(&buf)) return NULL; + + for (pos = input; pos[0] == '"'; pos++) + { + pos++; + if (!(next = wcsstr(pos, L"\""))) goto error; + strbuf_append(&buf, pos, next - pos); + strbuf_append(&buf, L"", ARRAY_SIZE(L"")); + + pos = next + 1; + if (!pos[0]) break; + if (pos[0] != ',') + { + FIXME("Error while parsing REG_MULTI_SZ string: Expected comma but got '%c'\n", pos[0]); + goto error; + } + } + + if (pos[0]) + { + FIXME("Error while parsing REG_MULTI_SZ string: Garbage at end of string\n"); + goto error; + } + + strbuf_append(&buf, L"", ARRAY_SIZE(L"")); + *size = buf.pos * sizeof(WCHAR); + return buf.buf; + +error: + strbuf_free(&buf); + return NULL; +} + +static BOOL install_registry_multisz(struct assembly_entry *assembly, HKEY key, struct registrykv_entry *registrykv, BOOL dryrun) +{ + DWORD value_size; + WCHAR *value = parse_multisz(registrykv->value, &value_size); + BOOL ret = TRUE; + + if (registrykv->value && registrykv->value[0] && !value) + return FALSE; + + if (!dryrun && RegSetValueExW(key, registrykv->name, 0, REG_MULTI_SZ, (void *)value, value_size)) + { + ERR("Failed to set registry key %s\n", debugstr_w(registrykv->name)); + ret = FALSE; + } + + heap_free(value); + return ret; +} + +static BOOL install_registry_dword(struct assembly_entry *assembly, HKEY key, struct registrykv_entry *registrykv, BOOL dryrun) +{ + DWORD value = registrykv->value_type ? wcstoul(registrykv->value_type, NULL, 16) : 0; + BOOL ret = TRUE; + + if (!dryrun && RegSetValueExW(key, registrykv->name, 0, REG_DWORD, (void *)&value, sizeof(value))) + { + ERR("Failed to set registry key %s\n", debugstr_w(registrykv->name)); + ret = FALSE; + } + + return ret; +} + +static BYTE *parse_hex(const WCHAR *input, DWORD *size) +{ + WCHAR number[3] = {0, 0, 0}; + BYTE *output, *p; + int length; + + *size = 0; + if (!input) return NULL; + length = lstrlenW(input); + if (length & 1) return NULL; + length >>= 1; + + if (!(output = heap_alloc(length))) return NULL; + for (p = output; *input; input += 2) + { + number[0] = input[0]; + number[1] = input[1]; + *p++ = wcstoul(number, 0, 16); + } + *size = length; + return output; +} + +static BOOL install_registry_binary(struct assembly_entry *assembly, HKEY key, struct registrykv_entry *registrykv, BOOL dryrun) +{ + DWORD value_size; + BYTE *value = parse_hex(registrykv->value, &value_size); + BOOL ret = TRUE; + + if (registrykv->value && !value) + return FALSE; + + if (!dryrun && RegSetValueExW(key, registrykv->name, 0, REG_BINARY, value, value_size)) + { + ERR("Failed to set registry key %s\n", debugstr_w(registrykv->name)); + ret = FALSE; + } + + heap_free(value); + return ret; +} + +static BOOL install_registry_value(struct assembly_entry *assembly, HKEY key, struct registrykv_entry *registrykv, BOOL dryrun) +{ + TRACE("Setting registry key %s = %s\n", debugstr_w(registrykv->name), debugstr_w(registrykv->value)); + + if (!wcscmp(registrykv->value_type, L"REG_SZ")) + return install_registry_string(assembly, key, registrykv, REG_SZ, dryrun); + if (!wcscmp(registrykv->value_type, L"REG_EXPAND_SZ")) + return install_registry_string(assembly, key, registrykv, REG_EXPAND_SZ, dryrun); + if (!wcscmp(registrykv->value_type, L"REG_MULTI_SZ")) + return install_registry_multisz(assembly, key, registrykv, dryrun); + if (!wcscmp(registrykv->value_type, L"REG_DWORD")) + return install_registry_dword(assembly, key, registrykv, dryrun); + if (!wcscmp(registrykv->value_type, L"REG_BINARY")) + return install_registry_binary(assembly, key, registrykv, dryrun); + + FIXME("Unsupported registry value type %s\n", debugstr_w(registrykv->value_type)); + return FALSE; +} + +static BOOL install_registry(struct assembly_entry *assembly, BOOL dryrun) +{ + struct registryop_entry *registryop; + struct registrykv_entry *registrykv; + HKEY root, subkey; + WCHAR *path; + REGSAM sam = KEY_ALL_ACCESS; + BOOL ret = TRUE; + +#ifdef __x86_64__ + if (!wcscmp(assembly->identity.architecture, L"x86")) sam |= KEY_WOW64_32KEY; +#endif + + LIST_FOR_EACH_ENTRY(registryop, &assembly->registryops, struct registryop_entry, entry) + { + if (!(path = split_registry_key(registryop->key, &root))) + { + ret = FALSE; + break; + } + + TRACE("Processing registry key %s\n", debugstr_w(registryop->key)); + + if (!dryrun && RegCreateKeyExW(root, path, 0, NULL, 0, sam, NULL, &subkey, NULL)) + { + ERR("Failed to open registry key %s\n", debugstr_w(registryop->key)); + ret = FALSE; + break; + } + + LIST_FOR_EACH_ENTRY(registrykv, &registryop->keyvalues, struct registrykv_entry, entry) + { + if (!(ret = install_registry_value(assembly, subkey, registrykv, dryrun))) break; + } + + if (!dryrun) RegCloseKey(subkey); + if (!ret) break; + } + + return ret; +} + +static BOOL install_assembly(struct list *manifest_list, struct assembly_identity *identity, BOOL dryrun) +{ + struct dependency_entry *dependency; + struct assembly_entry *assembly; + const WCHAR *name; + + if (!(assembly = lookup_assembly(manifest_list, identity))) + { + FIXME("Assembly %s not found\n", debugstr_w(identity->name)); + return FALSE; + } + + name = assembly->identity.name; + + if (assembly->status == ASSEMBLY_STATUS_INSTALLED) + { + TRACE("Assembly %s already installed\n", debugstr_w(name)); + return TRUE; + } + if (assembly->status == ASSEMBLY_STATUS_IN_PROGRESS) + { + ERR("Assembly %s caused circular dependency\n", debugstr_w(name)); + return FALSE; + } + +#ifdef __i386__ + if (!wcscmp(assembly->identity.architecture, L"amd64")) + { + ERR("Cannot install amd64 assembly in 32-bit prefix\n"); + return FALSE; + } +#endif + + assembly->status = ASSEMBLY_STATUS_IN_PROGRESS; + + LIST_FOR_EACH_ENTRY(dependency, &assembly->dependencies, struct dependency_entry, entry) + { + if (!install_assembly(manifest_list, &dependency->identity, dryrun)) return FALSE; + } + + TRACE("Installing assembly %s%s\n", debugstr_w(name), dryrun ? " (dryrun)" : ""); + + if (!install_files(assembly, dryrun)) + { + ERR("Failed to install all files for %s\n", debugstr_w(name)); + return FALSE; + } + + if (!install_registry(assembly, dryrun)) + { + ERR("Failed to install registry keys for %s\n", debugstr_w(name)); + return FALSE; + } + + TRACE("Installation of %s finished\n", debugstr_w(name)); + + assembly->status = ASSEMBLY_STATUS_INSTALLED; + return TRUE; +} + +static BOOL install_updates(struct installer_state *state, BOOL dryrun) +{ + struct dependency_entry *dependency; + LIST_FOR_EACH_ENTRY(dependency, &state->updates, struct dependency_entry, entry) + { + if (!install_assembly(&state->assemblies, &dependency->identity, dryrun)) + { + ERR("Failed to install update %s\n", debugstr_w(dependency->identity.name)); + return FALSE; + } + } + return TRUE; +} + +static void set_assembly_status(struct list *manifest_list, DWORD status) +{ + struct assembly_entry *assembly; + LIST_FOR_EACH_ENTRY(assembly, manifest_list, struct assembly_entry, entry) + { + assembly->status = status; + } +} + static BOOL install_msu(const WCHAR *filename, struct installer_state *state) { const WCHAR *temp_path; @@ -474,6 +983,29 @@ static BOOL install_msu(const WCHAR *filename, struct installer_state *state) } } + if (list_empty(&state->updates)) + { + ERR("No updates found, probably incompatible MSU file format?\n"); + goto done; + } + + /* perform dry run */ + set_assembly_status(&state->assemblies, ASSEMBLY_STATUS_NONE); + if (!install_updates(state, TRUE)) + { + ERR("Dry run failed, aborting installation\n"); + goto done; + } + + /* installation */ + set_assembly_status(&state->assemblies, ASSEMBLY_STATUS_NONE); + if (!install_updates(state, FALSE)) + { + ERR("Installation failed\n"); + goto done; + } + + TRACE("Installation finished\n"); ret = TRUE; done: @@ -481,12 +1013,42 @@ done: return ret; } +static void restart_as_x86_64(void) +{ + WCHAR filename[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOW si; + DWORD exit_code = 1; + void *redir; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + GetModuleFileNameW(0, filename, MAX_PATH); + + Wow64DisableWow64FsRedirection(&redir); + if (CreateProcessW(filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + TRACE("Restarting %s\n", wine_dbgstr_w(filename)); + WaitForSingleObject(pi.hProcess, INFINITE); + GetExitCodeProcess(pi.hProcess, &exit_code); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + else ERR("Failed to restart 64-bit %s, err %u\n", wine_dbgstr_w(filename), GetLastError()); + Wow64RevertWow64FsRedirection(redir); + + ExitProcess(exit_code); +} + int __cdecl wmain(int argc, WCHAR *argv[]) { struct installer_state state; const WCHAR *filename = NULL; + BOOL is_wow64; int i; + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) restart_as_x86_64(); + state.norestart = FALSE; state.quiet = FALSE; diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h index e717fad6e0..dcd784e764 100644 --- a/programs/wusa/wusa.h +++ b/programs/wusa/wusa.h @@ -90,6 +90,12 @@ static inline void *heap_alloc_zero(size_t len) return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } +static void *heap_realloc(void *mem, size_t len) __WINE_ALLOC_SIZE(2); +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); @@ -127,3 +133,16 @@ static inline WCHAR *strdupW(const WCHAR *str) if (ret) lstrcpyW(ret, str); return ret; } + +static inline WCHAR *strdupWn(const WCHAR *str, DWORD len) +{ + WCHAR *ret; + if (!str) return NULL; + ret = heap_alloc((len + 1) * sizeof(WCHAR)); + if (ret) + { + memcpy(ret, str, len * sizeof(WCHAR)); + ret[len] = 0; + } + return ret; +} -- 2.20.1

1 0

[PATCH 3/4] wusa: Parse update descriptions.
by Hans Leidekker 02 Dec '19

02 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/wusa/main.c | 46 +++++++++++++++++ programs/wusa/manifest.c | 106 +++++++++++++++++++++++++++++++++++++++ programs/wusa/wusa.h | 2 + 3 files changed, 154 insertions(+) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index a1cdea4ee8..8df8731e2b 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -41,6 +41,7 @@ struct installer_state BOOL quiet; struct list tempdirs; struct list assemblies; + struct list updates; }; static void * CDECL cabinet_alloc(ULONG cb) @@ -317,6 +318,7 @@ static void installer_cleanup(struct installer_state *state) { struct installer_tempdir *tempdir, *tempdir2; struct assembly_entry *assembly, *assembly2; + struct dependency_entry *dependency, *dependency2; LIST_FOR_EACH_ENTRY_SAFE(tempdir, tempdir2, &state->tempdirs, struct installer_tempdir, entry) { @@ -330,6 +332,11 @@ static void installer_cleanup(struct installer_state *state) list_remove(&assembly->entry); free_assembly(assembly); } + LIST_FOR_EACH_ENTRY_SAFE(dependency, dependency2, &state->updates, struct dependency_entry, entry) + { + list_remove(&dependency->entry); + free_dependency(dependency); + } } static BOOL str_ends_with(const WCHAR *str, const WCHAR *suffix) @@ -397,6 +404,7 @@ static BOOL install_msu(const WCHAR *filename, struct installer_state *state) list_init(&state->tempdirs); list_init(&state->assemblies); + list_init(&state->updates); CoInitialize(NULL); TRACE("Processing msu file %s\n", debugstr_w(filename)); @@ -428,6 +436,44 @@ static BOOL install_msu(const WCHAR *filename, struct installer_state *state) FindClose(search); } + /* load all update descriptions */ + if (!(path = path_combine(temp_path, L"*.xml"))) goto done; + search = FindFirstFileW(path, &data); + heap_free(path); + + if (search != INVALID_HANDLE_VALUE) + { + do + { + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; + if (!(path = path_combine(temp_path, data.cFileName))) continue; + if (!load_update(path, &state->updates)) + ERR("Failed to load all updates from %s, ignoring\n", debugstr_w(path)); + heap_free(path); + } + while (FindNextFileW(search, &data)); + FindClose(search); + } + + /* dump package information (for debugging) */ + if (TRACE_ON(wusa)) + { + struct dependency_entry *dependency; + struct assembly_entry *assembly; + + TRACE("List of updates:\n"); + LIST_FOR_EACH_ENTRY(dependency, &state->updates, struct dependency_entry, entry) + TRACE(" * %s\n", debugstr_w(dependency->identity.name)); + + TRACE("List of manifests (with dependencies):\n"); + LIST_FOR_EACH_ENTRY(assembly, &state->assemblies, struct assembly_entry, entry) + { + TRACE(" * %s\n", debugstr_w(assembly->identity.name)); + LIST_FOR_EACH_ENTRY(dependency, &assembly->dependencies, struct dependency_entry, entry) + TRACE(" -> %s\n", debugstr_w(dependency->identity.name)); + } + } + ret = TRUE; done: diff --git a/programs/wusa/manifest.c b/programs/wusa/manifest.c index 44c263f6c0..e80c11998c 100644 --- a/programs/wusa/manifest.c +++ b/programs/wusa/manifest.c @@ -565,3 +565,109 @@ done: IXMLDOMElement_Release(root); return entry; } + +/* <unattend><servicing><package> */ +static BOOL read_update_package(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct dependency_entry *entry; + struct list *update_list = context; + + if (!wcscmp(tagname, L"source")) return TRUE; + if (wcscmp(tagname, L"assemblyIdentity")) + { + TRACE("Ignoring unexpected tag %s\n", debugstr_w(tagname)); + return TRUE; + } + + if ((entry = alloc_dependency())) + { + if (read_identity(child, &entry->identity)) + { + TRACE("Found update %s\n", debugstr_w(entry->identity.name)); + list_add_tail(update_list, &entry->entry); + return TRUE; + } + free_dependency(entry); + } + + return FALSE; +} + +static BOOL iter_update_package(IXMLDOMElement *root, struct list *update_list) +{ + return call_xml_callbacks(root, read_update_package, update_list); +} + +/* <unattend><servicing> */ +static BOOL read_servicing(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct list *update_list = context; + WCHAR *action; + BOOL ret = TRUE; + + if (wcscmp(tagname, L"package")) + { + FIXME("Ignoring unexpected tag %s\n", debugstr_w(tagname)); + return TRUE; + } + + if (!(action = get_xml_attribute(child, L"action"))) + { + FIXME("Servicing tag doesn't specify action\n"); + return FALSE; + } + + if (!wcscmp(action, L"install")) + ret = iter_update_package(child, update_list); + else + FIXME("action %s not supported\n", debugstr_w(action)); + + heap_free(action); + return ret; +} + +static BOOL iter_servicing(IXMLDOMElement *root, struct list *update_list) +{ + return call_xml_callbacks(root, read_servicing, update_list); +} + +/* <unattend> */ +static BOOL read_unattend(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct list *update_list = context; + + if (wcscmp(tagname, L"servicing")) + { + FIXME("Ignoring unexpected tag %s\n", debugstr_w(tagname)); + return TRUE; + } + + return iter_servicing(child, update_list); + +} + +static BOOL iter_unattend(IXMLDOMElement *root, struct list *update_list) +{ + return call_xml_callbacks(root, read_unattend, update_list); +} + +BOOL load_update(const WCHAR *filename, struct list *update_list) +{ + IXMLDOMElement *root = NULL; + BOOL ret = FALSE; + + TRACE("Reading update %s\n", debugstr_w(filename)); + + if (!(root = load_xml(filename))) return FALSE; + if (!check_xml_tagname(root, L"unattend")) + { + FIXME("Didn't find unattend root node?\n"); + goto done; + } + + ret = iter_unattend(root, update_list); + +done: + IXMLDOMElement_Release(root); + return ret; +} diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h index 2c81b639b9..e717fad6e0 100644 --- a/programs/wusa/wusa.h +++ b/programs/wusa/wusa.h @@ -74,7 +74,9 @@ struct assembly_entry }; void free_assembly(struct assembly_entry *entry) DECLSPEC_HIDDEN; +void free_dependency(struct dependency_entry *entry) DECLSPEC_HIDDEN; struct assembly_entry *load_manifest(const WCHAR *filename) DECLSPEC_HIDDEN; +BOOL load_update(const WCHAR *filename, struct list *update_list) DECLSPEC_HIDDEN; static void *heap_alloc(size_t len) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc(size_t len) -- 2.20.1

1 0

[PATCH 2/4] wusa: Parse assembly manifests.
by Hans Leidekker 02 Dec '19

02 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/wusa/Makefile.in | 5 +- programs/wusa/main.c | 87 ++++++ programs/wusa/manifest.c | 567 ++++++++++++++++++++++++++++++++++++++ programs/wusa/wusa.h | 65 +++++ 4 files changed, 722 insertions(+), 2 deletions(-) create mode 100644 programs/wusa/manifest.c diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index 5e60bdf1b0..87bfe1dae0 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,7 +1,8 @@ MODULE = wusa.exe -IMPORTS = cabinet shlwapi +IMPORTS = cabinet shlwapi ole32 oleaut32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ - main.c + main.c \ + manifest.c diff --git a/programs/wusa/main.c b/programs/wusa/main.c index a719eefc5b..a1cdea4ee8 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -40,6 +40,7 @@ struct installer_state BOOL norestart; BOOL quiet; struct list tempdirs; + struct list assemblies; }; static void * CDECL cabinet_alloc(ULONG cb) @@ -315,6 +316,7 @@ static BOOL delete_directory(const WCHAR *path) static void installer_cleanup(struct installer_state *state) { struct installer_tempdir *tempdir, *tempdir2; + struct assembly_entry *assembly, *assembly2; LIST_FOR_EACH_ENTRY_SAFE(tempdir, tempdir2, &state->tempdirs, struct installer_tempdir, entry) { @@ -323,14 +325,79 @@ static void installer_cleanup(struct installer_state *state) heap_free(tempdir->path); heap_free(tempdir); } + LIST_FOR_EACH_ENTRY_SAFE(assembly, assembly2, &state->assemblies, struct assembly_entry, entry) + { + list_remove(&assembly->entry); + free_assembly(assembly); + } +} + +static BOOL str_ends_with(const WCHAR *str, const WCHAR *suffix) +{ + DWORD str_len = lstrlenW(str), suffix_len = lstrlenW(suffix); + if (suffix_len > str_len) return FALSE; + return !wcsicmp(str + str_len - suffix_len, suffix); +} + +static BOOL load_assemblies_from_cab(const WCHAR *filename, struct installer_state *state) +{ + struct assembly_entry *assembly; + const WCHAR *temp_path; + WIN32_FIND_DATAW data; + HANDLE search; + WCHAR *path; + + TRACE("Processing cab file %s\n", debugstr_w(filename)); + + if (!(temp_path = create_temp_directory(state))) return FALSE; + if (!extract_cabinet(filename, temp_path)) + { + ERR("Failed to extract %s\n", debugstr_w(filename)); + return FALSE; + } + + if (!(path = path_combine(temp_path, L"_manifest_.cix.xml"))) return FALSE; + if (GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) + { + FIXME("Cabinet uses proprietary msdelta file compression which is not (yet) supported\n"); + FIXME("Installation of msu file will most likely fail\n"); + } + heap_free(path); + + if (!(path = path_combine(temp_path, L"*"))) return FALSE; + search = FindFirstFileW(path, &data); + heap_free(path); + + if (search != INVALID_HANDLE_VALUE) + { + do + { + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; + if (!str_ends_with(data.cFileName, L".manifest") && + !str_ends_with(data.cFileName, L".mum")) continue; + if (!(path = path_combine(temp_path, data.cFileName))) continue; + if ((assembly = load_manifest(path))) + list_add_tail(&state->assemblies, &assembly->entry); + heap_free(path); + } + while (FindNextFileW(search, &data)); + FindClose(search); + } + + return TRUE; } static BOOL install_msu(const WCHAR *filename, struct installer_state *state) { const WCHAR *temp_path; + WIN32_FIND_DATAW data; + HANDLE search; + WCHAR *path; BOOL ret = FALSE; list_init(&state->tempdirs); + list_init(&state->assemblies); + CoInitialize(NULL); TRACE("Processing msu file %s\n", debugstr_w(filename)); @@ -341,6 +408,26 @@ static BOOL install_msu(const WCHAR *filename, struct installer_state *state) goto done; } + /* load all manifests from contained cabinet archives */ + if (!(path = path_combine(temp_path, L"*.cab"))) goto done; + search = FindFirstFileW(path, &data); + heap_free(path); + + if (search != INVALID_HANDLE_VALUE) + { + do + { + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; + if (!wcsicmp(data.cFileName, L"WSUSSCAN.cab")) continue; + if (!(path = path_combine(temp_path, data.cFileName))) continue; + if (!load_assemblies_from_cab(path, state)) + ERR("Failed to load all manifests from %s, ignoring\n", debugstr_w(path)); + heap_free(path); + } + while (FindNextFileW(search, &data)); + FindClose(search); + } + ret = TRUE; done: diff --git a/programs/wusa/manifest.c b/programs/wusa/manifest.c new file mode 100644 index 0000000000..44c263f6c0 --- /dev/null +++ b/programs/wusa/manifest.c @@ -0,0 +1,567 @@ +/* + * Manifest parser for WUSA + * + * Copyright 2015 Michael Müller + * Copyright 2015 Sebastian Lackner + * + * 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 <windows.h> +#define COBJMACROS +#include <initguid.h> +#include <msxml.h> + +#include "wine/debug.h" +#include "wine/list.h" +#include "wusa.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wusa); + +static struct dependency_entry *alloc_dependency(void) +{ + struct dependency_entry *entry = heap_alloc_zero(sizeof(*entry)); + if (!entry) ERR("Failed to allocate memory for dependency\n"); + return entry; +} + +static struct fileop_entry *alloc_fileop(void) +{ + struct fileop_entry *entry = heap_alloc_zero(sizeof(*entry)); + if (!entry) ERR("Failed to allocate memory for fileop\n"); + return entry; +} + +static struct registrykv_entry *alloc_registrykv(void) +{ + struct registrykv_entry *entry = heap_alloc_zero(sizeof(*entry)); + if (!entry) ERR("Failed to allocate memory for registrykv\n"); + return entry; +} + +static struct registryop_entry *alloc_registryop(void) +{ + struct registryop_entry *entry = heap_alloc_zero(sizeof(*entry)); + if (!entry) ERR("Failed to allocate memory for registryop\n"); + else + { + list_init(&entry->keyvalues); + } + return entry; +} + +static struct assembly_entry *alloc_assembly(void) +{ + struct assembly_entry *entry = heap_alloc_zero(sizeof(*entry)); + if (!entry) ERR("Failed to allocate memory for assembly\n"); + else + { + list_init(&entry->dependencies); + list_init(&entry->fileops); + list_init(&entry->registryops); + } + return entry; +} + +static void clear_identity(struct assembly_identity *entry) +{ + heap_free(entry->name); + heap_free(entry->version); + heap_free(entry->architecture); + heap_free(entry->language); + heap_free(entry->pubkey_token); +} + +void free_dependency(struct dependency_entry *entry) +{ + clear_identity(&entry->identity); + heap_free(entry); +} + +static void free_fileop(struct fileop_entry *entry) +{ + heap_free(entry->source); + heap_free(entry->target); + heap_free(entry); +} + +static void free_registrykv(struct registrykv_entry *entry) +{ + heap_free(entry->name); + heap_free(entry->value_type); + heap_free(entry->value); + heap_free(entry); +} + +static void free_registryop(struct registryop_entry *entry) +{ + struct registrykv_entry *keyvalue, *keyvalue2; + + heap_free(entry->key); + + LIST_FOR_EACH_ENTRY_SAFE(keyvalue, keyvalue2, &entry->keyvalues, struct registrykv_entry, entry) + { + list_remove(&keyvalue->entry); + free_registrykv(keyvalue); + } + + heap_free(entry); +} + +void free_assembly(struct assembly_entry *entry) +{ + struct dependency_entry *dependency, *dependency2; + struct fileop_entry *fileop, *fileop2; + struct registryop_entry *registryop, *registryop2; + + heap_free(entry->filename); + heap_free(entry->displayname); + clear_identity(&entry->identity); + + LIST_FOR_EACH_ENTRY_SAFE(dependency, dependency2, &entry->dependencies, struct dependency_entry, entry) + { + list_remove(&dependency->entry); + free_dependency(dependency); + } + LIST_FOR_EACH_ENTRY_SAFE(fileop, fileop2, &entry->fileops, struct fileop_entry, entry) + { + list_remove(&fileop->entry); + free_fileop(fileop); + } + LIST_FOR_EACH_ENTRY_SAFE(registryop, registryop2, &entry->registryops, struct registryop_entry, entry) + { + list_remove(&registryop->entry); + free_registryop(registryop); + } + + heap_free(entry); +} + +static WCHAR *get_xml_attribute(IXMLDOMElement *root, const WCHAR *name) +{ + WCHAR *ret = NULL; + VARIANT var; + BSTR bstr; + + if ((bstr = SysAllocString(name))) + { + VariantInit(&var); + if (SUCCEEDED(IXMLDOMElement_getAttribute(root, bstr, &var))) + { + ret = (V_VT(&var) == VT_BSTR) ? strdupW(V_BSTR(&var)) : NULL; + VariantClear(&var); + } + SysFreeString(bstr); + } + + return ret; +} + +static BOOL check_xml_tagname(IXMLDOMElement *root, const WCHAR *tagname) +{ + BOOL ret = FALSE; + BSTR bstr; + + if (SUCCEEDED(IXMLDOMElement_get_tagName(root, &bstr))) + { + ret = !wcscmp(bstr, tagname); + SysFreeString(bstr); + } + + return ret; +} + +static IXMLDOMElement *select_xml_node(IXMLDOMElement *root, const WCHAR *name) +{ + IXMLDOMElement *ret = NULL; + IXMLDOMNode *node; + BSTR bstr; + + if ((bstr = SysAllocString(name))) + { + if (SUCCEEDED(IXMLDOMElement_selectSingleNode(root, bstr, &node))) + { + if (FAILED(IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void **)&ret))) + ret = NULL; + IXMLDOMNode_Release(node); + } + SysFreeString(bstr); + } + + return ret; +} + +static BOOL call_xml_callbacks(IXMLDOMElement *root, BOOL (*func)(IXMLDOMElement *child, WCHAR *tagname, void *context), void *context) +{ + IXMLDOMNodeList *children; + IXMLDOMElement *child; + IXMLDOMNode *node; + BSTR tagname; + BOOL ret = TRUE; + + if (FAILED(IXMLDOMElement_get_childNodes(root, &children))) + return FALSE; + + while (ret && IXMLDOMNodeList_nextNode(children, &node) == S_OK) + { + if (SUCCEEDED(IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void **)&child))) + { + if (SUCCEEDED(IXMLDOMElement_get_tagName(child, &tagname))) + { + ret = func(child, tagname, context); + SysFreeString(tagname); + } + IXMLDOMElement_Release(child); + } + IXMLDOMNode_Release(node); + } + + IXMLDOMNodeList_Release(children); + return ret; +} + +static IXMLDOMElement *load_xml(const WCHAR *filename) +{ + IXMLDOMDocument *document = NULL; + IXMLDOMElement *root = NULL; + VARIANT_BOOL success; + VARIANT variant; + BSTR bstr; + + TRACE("Loading XML from %s\n", debugstr_w(filename)); + + if (!(bstr = SysAllocString(filename))) + return FALSE; + + if (SUCCEEDED(CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void **)&document))) + { + VariantInit(&variant); + V_VT(&variant) = VT_BSTR; + V_BSTR(&variant) = bstr; + + if (SUCCEEDED(IXMLDOMDocument_load(document, variant, &success)) && success) + { + if (FAILED(IXMLDOMDocument_get_documentElement(document, &root))) + root = NULL; + } + IXMLDOMDocument_Release(document); + } + + SysFreeString(bstr); + return root; +} + +static BOOL read_identity(IXMLDOMElement *root, struct assembly_identity *identity) +{ + memset(identity, 0, sizeof(*identity)); + if (!(identity->name = get_xml_attribute(root, L"name"))) goto error; + if (!(identity->version = get_xml_attribute(root, L"version"))) goto error; + if (!(identity->architecture = get_xml_attribute(root, L"processorArchitecture"))) goto error; + if (!(identity->language = get_xml_attribute(root, L"language"))) goto error; + if (!(identity->pubkey_token = get_xml_attribute(root, L"publicKeyToken"))) goto error; + return TRUE; + +error: + clear_identity(identity); + return FALSE; +} + +/* <assembly><dependency><dependentAssembly> */ +static BOOL read_dependent_assembly(IXMLDOMElement *root, struct assembly_identity *identity) +{ + IXMLDOMElement *child = NULL; + WCHAR *dependency_type; + BOOL ret = FALSE; + + if (!(dependency_type = get_xml_attribute(root, L"dependencyType"))) + { + WARN("Failed to get dependency type, assuming install\n"); + } + if (dependency_type && wcscmp(dependency_type, L"install") && wcscmp(dependency_type, L"prerequisite")) + { + FIXME("Unimplemented dependency type %s\n", debugstr_w(dependency_type)); + goto error; + } + if (!(child = select_xml_node(root, L".//assemblyIdentity"))) + { + FIXME("Failed to find assemblyIdentity child node\n"); + goto error; + } + + ret = read_identity(child, identity); + +error: + if (child) IXMLDOMElement_Release(child); + heap_free(dependency_type); + return ret; +} + +/* <assembly><dependency> */ +static BOOL read_dependency(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct assembly_entry *assembly = context; + struct dependency_entry *entry; + + if (wcscmp(tagname, L"dependentAssembly")) + { + FIXME("Don't know how to handle dependency tag %s\n", debugstr_w(tagname)); + return FALSE; + } + + if ((entry = alloc_dependency())) + { + if (read_dependent_assembly(child, &entry->identity)) + { + TRACE("Found dependency %s\n", debugstr_w(entry->identity.name)); + list_add_tail(&assembly->dependencies, &entry->entry); + return TRUE; + } + free_dependency(entry); + } + + return FALSE; +} + +static BOOL iter_dependency(IXMLDOMElement *root, struct assembly_entry *assembly) +{ + return call_xml_callbacks(root, read_dependency, assembly); +} + +/* <assembly><package><update><component> */ +/* <assembly><package><update><package> */ +static BOOL read_components(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct assembly_entry *assembly = context; + struct dependency_entry *entry; + + if (wcscmp(tagname, L"assemblyIdentity")) + { + FIXME("Ignoring unexpected tag %s\n", debugstr_w(tagname)); + return TRUE; + } + + if ((entry = alloc_dependency())) + { + if (read_identity(child, &entry->identity)) + { + TRACE("Found identity %s\n", debugstr_w(entry->identity.name)); + list_add_tail(&assembly->dependencies, &entry->entry); + return TRUE; + } + free_dependency(entry); + } + + return FALSE; +} + +static BOOL iter_components(IXMLDOMElement *root, struct assembly_entry *assembly) +{ + return call_xml_callbacks(root, read_components, assembly); +} + +/* <assembly><package><update> */ +static BOOL read_update(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct assembly_entry *assembly = context; + + if (!wcscmp(tagname, L"component")) + return iter_components(child, assembly); + if (!wcscmp(tagname, L"package")) + return iter_components(child, assembly); + if (!wcscmp(tagname, L"applicable")) + return TRUE; + + FIXME("Ignoring unexpected tag %s\n", debugstr_w(tagname)); + return FALSE; +} + +static BOOL iter_update(IXMLDOMElement *root, struct assembly_entry *assembly) +{ + return call_xml_callbacks(root, read_update, assembly); +} + +/* <assembly><package> */ +static BOOL read_package(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct assembly_entry *assembly = context; + + if (!wcscmp(tagname, L"update")) + return iter_update(child, assembly); + if (!wcscmp(tagname, L"parent")) + return TRUE; + + FIXME("Ignoring unexpected tag %s\n", debugstr_w(tagname)); + return TRUE; +} + +static BOOL iter_package(IXMLDOMElement *root, struct assembly_entry *assembly) +{ + return call_xml_callbacks(root, read_package, assembly); +} + +/* <assembly><file> */ +static BOOL read_file(IXMLDOMElement *root, struct assembly_entry *assembly) +{ + struct fileop_entry *entry; + + if (!(entry = alloc_fileop())) + return FALSE; + + if (!(entry->source = get_xml_attribute(root, L"sourceName"))) goto error; + if (!(entry->target = get_xml_attribute(root, L"destinationPath"))) goto error; + + TRACE("Found fileop %s -> %s\n", debugstr_w(entry->source), debugstr_w(entry->target)); + list_add_tail(&assembly->fileops, &entry->entry); + return TRUE; + +error: + free_fileop(entry); + return FALSE; +} + +/* <assembly><registryKeys><registryKey> */ +static BOOL read_registry_key(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct registryop_entry *registryop = context; + struct registrykv_entry *entry; + + if (!wcscmp(tagname, L"securityDescriptor")) return TRUE; + if (!wcscmp(tagname, L"systemProtection")) return TRUE; + if (wcscmp(tagname, L"registryValue")) + { + FIXME("Ignoring unexpected tag %s\n", debugstr_w(tagname)); + return TRUE; + } + + if (!(entry = alloc_registrykv())) + return FALSE; + + if (!(entry->value_type = get_xml_attribute(child, L"valueType"))) goto error; + entry->name = get_xml_attribute(child, L"name"); /* optional */ + entry->value = get_xml_attribute(child, L"value"); /* optional */ + + TRACE("Found registry %s -> %s\n", debugstr_w(entry->name), debugstr_w(entry->value)); + list_add_tail(&registryop->keyvalues, &entry->entry); + return TRUE; + +error: + free_registrykv(entry); + return FALSE; +} + +static BOOL iter_registry_key(IXMLDOMElement *root, struct registryop_entry *registryop) +{ + return call_xml_callbacks(root, read_registry_key, registryop); +} + +/* <assembly><registryKeys> */ +static BOOL read_registry_keys(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct assembly_entry *assembly = context; + struct registryop_entry *entry; + WCHAR *keyname; + + if (wcscmp(tagname, L"registryKey")) + { + FIXME("Ignoring unexpected tag %s\n", debugstr_w(tagname)); + return TRUE; + } + + if (!(keyname = get_xml_attribute(child, L"keyName"))) + { + FIXME("RegistryKey tag doesn't specify keyName\n"); + return FALSE; + } + + if ((entry = alloc_registryop())) + { + list_init(&entry->keyvalues); + if (iter_registry_key(child, entry)) + { + entry->key = keyname; + TRACE("Found registryop %s\n", debugstr_w(entry->key)); + list_add_tail(&assembly->registryops, &entry->entry); + return TRUE; + } + free_registryop(entry); + } + + heap_free(keyname); + return FALSE; +} + +static BOOL iter_registry_keys(IXMLDOMElement *root, struct assembly_entry *assembly) +{ + return call_xml_callbacks(root, read_registry_keys, assembly); +} + +/* <assembly> */ +static BOOL read_assembly(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct assembly_entry *assembly = context; + + if (!wcscmp(tagname, L"assemblyIdentity") && !assembly->identity.name) + return read_identity(child, &assembly->identity); + if (!wcscmp(tagname, L"dependency")) + return iter_dependency(child, assembly); + if (!wcscmp(tagname, L"package")) + return iter_package(child, assembly); + if (!wcscmp(tagname, L"file")) + return read_file(child, assembly); + if (!wcscmp(tagname, L"registryKeys")) + return iter_registry_keys(child, assembly); + if (!wcscmp(tagname, L"trustInfo")) + return TRUE; + if (!wcscmp(tagname, L"configuration")) + return TRUE; + if (!wcscmp(tagname, L"deployment")) + return TRUE; + + FIXME("Ignoring unexpected tag %s\n", debugstr_w(tagname)); + return TRUE; +} + +static BOOL iter_assembly(IXMLDOMElement *root, struct assembly_entry *assembly) +{ + return call_xml_callbacks(root, read_assembly, assembly); +} + +struct assembly_entry *load_manifest(const WCHAR *filename) +{ + struct assembly_entry *entry = NULL; + IXMLDOMElement *root = NULL; + + TRACE("Loading manifest %s\n", debugstr_w(filename)); + + if (!(root = load_xml(filename))) return NULL; + if (!check_xml_tagname(root, L"assembly")) + { + FIXME("Didn't find assembly root node?\n"); + goto done; + } + + if ((entry = alloc_assembly())) + { + entry->filename = strdupW(filename); + entry->displayname = get_xml_attribute(root, L"displayName"); + if (iter_assembly(root, entry)) goto done; + free_assembly(entry); + entry = NULL; + } + +done: + IXMLDOMElement_Release(root); + return entry; +} diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h index c6bf7eda11..2c81b639b9 100644 --- a/programs/wusa/wusa.h +++ b/programs/wusa/wusa.h @@ -17,12 +17,77 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +enum +{ + ASSEMBLY_STATUS_NONE, + ASSEMBLY_STATUS_IN_PROGRESS, + ASSEMBLY_STATUS_INSTALLED, +}; + +struct assembly_identity +{ + WCHAR *name; + WCHAR *version; + WCHAR *architecture; + WCHAR *language; + WCHAR *pubkey_token; +}; + +struct dependency_entry +{ + struct list entry; + struct assembly_identity identity; +}; + +struct fileop_entry +{ + struct list entry; + WCHAR *source; + WCHAR *target; +}; + +struct registrykv_entry +{ + struct list entry; + WCHAR *name; + WCHAR *value_type; + WCHAR *value; +}; + +struct registryop_entry +{ + struct list entry; + WCHAR *key; + struct list keyvalues; +}; + +struct assembly_entry +{ + struct list entry; + DWORD status; + WCHAR *filename; + WCHAR *displayname; + struct assembly_identity identity; + struct list dependencies; + struct list fileops; + struct list registryops; +}; + +void free_assembly(struct assembly_entry *entry) DECLSPEC_HIDDEN; +struct assembly_entry *load_manifest(const WCHAR *filename) DECLSPEC_HIDDEN; + static void *heap_alloc(size_t len) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } +static void *heap_alloc_zero(size_t len) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); -- 2.20.1

1 0

[PATCH 2/3] d3d8/tests: Add out-of-bounds region tests.
by Akihiro Sagawa 01 Dec '19

01 Dec '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/d3d8/tests/visual.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)

2 1

[PATCH 3/3] wined3d: Check dirty region dimensions.
by Akihiro Sagawa 01 Dec '19

01 Dec '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/texture.c | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-)

1 0