wine-devel May 2019

wine-devel@winehq.org

96 participants
789 discussions

[PATCH v2 1/2] kernel32: Add sxs tests
by Fabian Maurer 06 Jun '19

06 Jun '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v2 - Free dlls only once - fail when resource creation fails - better document activation context error on XP --- dlls/kernel32/tests/Makefile.in | 5 + dlls/kernel32/tests/resource.rc | 12 + dlls/kernel32/tests/sxs.c | 312 +++++++++++++++++++++++++ dlls/kernel32/tests/sxs_dll_1.c | 17 ++ dlls/kernel32/tests/sxs_dll_1.manifest | 7 + dlls/kernel32/tests/sxs_dll_1.spec | 1 + dlls/kernel32/tests/sxs_dll_2.c | 17 ++ dlls/kernel32/tests/sxs_dll_2.manifest | 7 + dlls/kernel32/tests/sxs_dll_2.spec | 1 + dlls/kernel32/tests/sxs_exe_1.manifest | 8 + dlls/kernel32/tests/sxs_exe_2.manifest | 8 + 11 files changed, 395 insertions(+) create mode 100644 dlls/kernel32/tests/sxs.c create mode 100644 dlls/kernel32/tests/sxs_dll_1.c create mode 100644 dlls/kernel32/tests/sxs_dll_1.manifest create mode 100644 dlls/kernel32/tests/sxs_dll_1.spec create mode 100644 dlls/kernel32/tests/sxs_dll_2.c create mode 100644 dlls/kernel32/tests/sxs_dll_2.manifest create mode 100644 dlls/kernel32/tests/sxs_dll_2.spec create mode 100644 dlls/kernel32/tests/sxs_exe_1.manifest create mode 100644 dlls/kernel32/tests/sxs_exe_2.manifest diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e06141d9f6..0318cae322 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -29,6 +29,11 @@ SOURCES = \ profile.c \ resource.c \ resource.rc \ + sxs.c \ + sxs_dll_1.c \ + sxs_dll_1.spec \ + sxs_dll_2.c \ + sxs_dll_2.spec \ sync.c \ thread.c \ time.c \ diff --git a/dlls/kernel32/tests/resource.rc b/dlls/kernel32/tests/resource.rc index f40a87819e..1512a477aa 100644 --- a/dlls/kernel32/tests/resource.rc +++ b/dlls/kernel32/tests/resource.rc @@ -24,3 +24,15 @@ { MENUITEM "foo", 1 } + +/* @makedep: sxs_exe_1.manifest */ +sxs_exe_1.manifest RCDATA sxs_exe_1.manifest + +/* @makedep: sxs_exe_2.manifest */ +sxs_exe_2.manifest RCDATA sxs_exe_2.manifest + +/* @makedep: sxs_dll_1.manifest */ +sxs_dll_1.manifest RCDATA sxs_dll_1.manifest + +/* @makedep: sxs_dll_2.manifest */ +sxs_dll_2.manifest RCDATA sxs_dll_2.manifest diff --git a/dlls/kernel32/tests/sxs.c b/dlls/kernel32/tests/sxs.c new file mode 100644 index 0000000000..629e3c4991 --- /dev/null +++ b/dlls/kernel32/tests/sxs.c @@ -0,0 +1,312 @@ +/* + * Side by side tests + * + * Copyright 2019 Fabian Maurer + * + * 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 "wine/test.h" +#include <winbase.h> +#include <windef.h> +#include "winuser.h" +#include <stdio.h> + +static BOOL write_resource_file(const char *path_tmp, const char *name_res, const char *name_file, char *path_file) +{ + HRSRC rsrc; + void *rsrc_data; + DWORD rsrc_size; + BOOL ret; + HANDLE hfile; + + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)RT_RCDATA); + if (!rsrc) + { + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)"TESTDLL"); + if (!rsrc) return FALSE; + } + + rsrc_data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!rsrc_data) return FALSE; + + rsrc_size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!rsrc_size) return FALSE; + + sprintf(path_file, "%s%s", path_tmp, name_file); + hfile = CreateFileA(path_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hfile, rsrc_data, rsrc_size, &rsrc_size, NULL); + + CloseHandle(hfile); + return ret; +} + +static void get_application_directory(char *buffer, int buffer_size) +{ + char *end; + GetModuleFileNameA(NULL, buffer, buffer_size); + end = strrchr(buffer, '\\'); + end[1] = 0; +} + +typedef struct +{ + char path_tmp[MAX_PATH]; + char path_dll[MAX_PATH]; + char path_manifest_exe[MAX_PATH]; + char path_manifest_dll[MAX_PATH]; + ACTCTXA context; + ULONG_PTR cookie; + HANDLE handle_context; + HMODULE module; + DWORD(WINAPI *test_func)(void); +} sxs_info; + +static BOOL fill_sxs_info(sxs_info *info, const char *temp, const char *path_dll, const char *exe_manifest, const char *dll_manifest) +{ + BOOL success; + + GetTempPathA(MAX_PATH, info->path_tmp); + strcat(info->path_tmp, temp); + strcat(info->path_tmp, "\\"); + CreateDirectoryA(info->path_tmp, NULL); + + success = write_resource_file(info->path_tmp, path_dll, "sxs_dll.dll", info->path_dll); + ok(success, "Failed to create file for testing\n"); + if (!success) + return FALSE; + + success = write_resource_file(info->path_tmp, exe_manifest, exe_manifest, info->path_manifest_exe); + ok(success, "Failed to create file for testing\n"); + if (!success) + return FALSE; + + success = write_resource_file(info->path_tmp, dll_manifest, "sxs_dll.manifest", info->path_manifest_dll); + ok(success, "Failed to create file for testing\n"); + if (!success) + return FALSE; + + info->context.cbSize = sizeof(ACTCTXA); + info->context.lpSource = info->path_manifest_exe; + info->context.lpAssemblyDirectory = info->path_tmp; + info->context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + info->handle_context = CreateActCtxA(&info->context); + ok((info->handle_context != NULL && info->handle_context != INVALID_HANDLE_VALUE ) + || broken(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX), /* XP doesn't support manifests outside of PE files */ + "CreateActCtxA failed: %d\n", GetLastError()); + if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) + { + skip("Failed to create activation context.\n"); + return FALSE; + } + + success = ActivateActCtx(info->handle_context, &info->cookie); + ok(success, "ActivateActCtx failed: %d\n", GetLastError()); + + info->module = LoadLibraryA("sxs_dll.dll"); + ok(info->module != NULL, "LoadLibrary failed\n"); + + info->test_func = (void *)GetProcAddress(info->module, "test_func"); + ok(info->test_func != NULL, "GetProcAddress failed\n"); + + DeactivateActCtx(0, info->cookie); + return TRUE; +} + +static void clean_sxs_info(sxs_info *info) +{ + if (info->handle_context) + ReleaseActCtx(info->handle_context); + if (*info->path_dll) + ok(DeleteFileA(info->path_dll), "DeleteFileA failed for %s: %d\n", info->path_dll, GetLastError()); + if (*info->path_manifest_exe) + ok(DeleteFileA(info->path_manifest_exe), "DeleteFileA failed for %s: %d\n", info->path_manifest_exe, GetLastError()); + if (*info->path_manifest_dll) + ok(DeleteFileA(info->path_manifest_dll), "DeleteFileA failed for %s: %d\n", info->path_manifest_dll, GetLastError()); + if (*info->path_tmp) + ok(RemoveDirectoryA(info->path_tmp), "RemoveDirectoryA failed for %s: %d\n", info->path_tmp, GetLastError()); +} + +/* Test loading two sxs dlls at the same time */ +static void test_two_dlls_at_same_time(void) +{ + sxs_info dll_1 = {0}; + sxs_info dll_2 = {0}; + DWORD ret; + + if (!fill_sxs_info(&dll_1, "1", "sxs_dll_1.dll", "sxs_exe_1.manifest", "sxs_dll_1.manifest")) + goto cleanup; + if (!fill_sxs_info(&dll_2, "2", "sxs_dll_2.dll", "sxs_exe_2.manifest", "sxs_dll_2.manifest")) + goto cleanup; + + todo_wine + ok(dll_1.module != dll_2.module, "Libraries are the same\n"); + ret = dll_1.test_func(); + ok(ret == 1, "Got %d\n", ret); + ret = dll_2.test_func(); + todo_wine + ok(ret == 2, "Got %d\n", ret); + +cleanup: + if (dll_1.module) + FreeLibrary(dll_1.module); + if (dll_2.module) + FreeLibrary(dll_2.module); + clean_sxs_info(&dll_1); + clean_sxs_info(&dll_2); +} + +/* Test loading a normal dll and then a sxs dll with the same name */ +static void test_one_sxs_and_one_local_1(void) +{ + sxs_info dll = {0}; + char path_dll_local[MAX_PATH] = {0}; + char path_application[MAX_PATH]; + HMODULE module = NULL; + DWORD(WINAPI *test_func)(void); + DWORD ret; + + get_application_directory(path_application, sizeof(path_application)); + + ret = write_resource_file(path_application, "sxs_dll_2.dll", "sxs_dll.dll", path_dll_local); + ok(ret, "Failed to create file for testing\n"); + if (!ret) + goto cleanup; + + module = LoadLibraryA(path_dll_local); + test_func = (void *)GetProcAddress(module, "test_func"); + + if (!fill_sxs_info(&dll, "1", "sxs_dll_1.dll", "sxs_exe_1.manifest", "sxs_dll_1.manifest")) + goto cleanup; + + todo_wine + ok(dll.module != module, "Libraries are the same\n"); + ret = dll.test_func(); + todo_wine + ok(ret == 1, "Got %d\n", ret); + ret = test_func(); + ok(ret == 2, "Got %d\n", ret); + +cleanup: + if (module) + FreeLibrary(module); + if (dll.module) + FreeLibrary(dll.module); + if (*path_dll_local) + ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + clean_sxs_info(&dll); +} + +/* Test if sxs dll has priority over normal dll */ +static void test_one_sxs_and_one_local_2(void) +{ + sxs_info dll = {0}; + char path_dll_local[MAX_PATH] = {0}; + char path_application[MAX_PATH]; + HMODULE module = NULL; + DWORD(WINAPI *test_func)(void); + DWORD ret; + + get_application_directory(path_application, sizeof(path_application)); + + ret = write_resource_file(path_application, "sxs_dll_2.dll", "sxs_dll.dll", path_dll_local); + ok (ret, "Failed to create file for testing\n"); + if (!ret) + goto cleanup; + + if (!fill_sxs_info(&dll, "1", "sxs_dll_1.dll", "sxs_exe_1.manifest", "sxs_dll_1.manifest")) + goto cleanup; + + module = LoadLibraryA(path_dll_local); + test_func = (void *)GetProcAddress(module, "test_func"); + + ok(dll.module != module, "Libraries are the same\n"); + ret = dll.test_func(); + ok(ret == 1, "Got %d\n", ret); + ret = test_func(); + ok(ret == 2, "Got %d\n", ret); + +cleanup: + if (module) + FreeLibrary(module); + if (dll.module) + FreeLibrary(dll.module); + if (*path_dll_local) + ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + clean_sxs_info(&dll); +} + +static void run_sxs_test(int run) +{ + switch(run) + { + case 1: + test_two_dlls_at_same_time(); + break; + case 2: + test_one_sxs_and_one_local_1(); + break; + case 3: + test_one_sxs_and_one_local_2(); + break; + } +} + +static void run_child_process(int run) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs( &argv ); + + if (strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s %d", argv[0], argv[1], run); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process( pi.hProcess ); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); +} + +START_TEST(sxs) +{ + int argc; + char **argv; + + argc = winetest_get_mainargs(&argv); + if (argc > 2) + { + int run = atoi(argv[2]); + run_sxs_test(run); + return; + } + run_child_process(1); + run_child_process(2); + run_child_process(3); +} diff --git a/dlls/kernel32/tests/sxs_dll_1.c b/dlls/kernel32/tests/sxs_dll_1.c new file mode 100644 index 0000000000..908d235059 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_1.c @@ -0,0 +1,17 @@ +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + break; + } + + return TRUE; +} + +DWORD WINAPI test_func(void) +{ + return 1; +} diff --git a/dlls/kernel32/tests/sxs_dll_1.manifest b/dlls/kernel32/tests/sxs_dll_1.manifest new file mode 100644 index 0000000000..61e3f4a652 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_1.manifest @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="sxs_dll" version="1.0.0.0" processorArchitecture="x86" publicKeyToken="0000000000000000"/> + <file name="sxs_dll.dll"> + <windowClass>sidebyside</windowClass> + </file> +</assembly> diff --git a/dlls/kernel32/tests/sxs_dll_1.spec b/dlls/kernel32/tests/sxs_dll_1.spec new file mode 100644 index 0000000000..ebbc584352 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_1.spec @@ -0,0 +1 @@ +@ stdcall test_func() diff --git a/dlls/kernel32/tests/sxs_dll_2.c b/dlls/kernel32/tests/sxs_dll_2.c new file mode 100644 index 0000000000..262c53a484 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_2.c @@ -0,0 +1,17 @@ +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + break; + } + + return TRUE; +} + +DWORD WINAPI test_func(void) +{ + return 2; +} diff --git a/dlls/kernel32/tests/sxs_dll_2.manifest b/dlls/kernel32/tests/sxs_dll_2.manifest new file mode 100644 index 0000000000..37b39bea3b --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_2.manifest @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="sxs_dll" version="2.0.0.0" processorArchitecture="x86" publicKeyToken="0000000000000000"/> + <file name="sxs_dll.dll"> + <windowClass>sidebyside</windowClass> + </file> +</assembly> diff --git a/dlls/kernel32/tests/sxs_dll_2.spec b/dlls/kernel32/tests/sxs_dll_2.spec new file mode 100644 index 0000000000..ebbc584352 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_2.spec @@ -0,0 +1 @@ +@ stdcall test_func() diff --git a/dlls/kernel32/tests/sxs_exe_1.manifest b/dlls/kernel32/tests/sxs_exe_1.manifest new file mode 100644 index 0000000000..633374eca3 --- /dev/null +++ b/dlls/kernel32/tests/sxs_exe_1.manifest @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="sxs_dll" version="1.0.0.0" processorArchitecture="x86" publicKeyToken="0000000000000000" language="*"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/dlls/kernel32/tests/sxs_exe_2.manifest b/dlls/kernel32/tests/sxs_exe_2.manifest new file mode 100644 index 0000000000..f93e497124 --- /dev/null +++ b/dlls/kernel32/tests/sxs_exe_2.manifest @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="sxs_dll" version="2.0.0.0" processorArchitecture="x86" publicKeyToken="0000000000000000" language="*"/> + </dependentAssembly> + </dependency> +</assembly> -- 2.21.0

3 3

[PATCH v2 resend] kernel32: Consider the working directory first when launching executables with CreateProcess.
by Erich E. Hoover 05 Jun '19

05 Jun '19

v2: Fix the logic so that having NoDefaultCurrentDirectoryInExePath set does not break the search *The three most relevant cases* Case 1: NoDefaultCurrentDirectoryInExePath = False NeedCurrentDirectoryForExePathW = True GetCurrentDirectoryW != 0 (True) SearchPathW = True Overall = True (stop search) Case 2: NoDefaultCurrentDirectoryInExePath = False NeedCurrentDirectoryForExePathW = True GetCurrentDirectoryW != 0 (True) SearchPathW = False Overall = False (continue search) Case 3: NoDefaultCurrentDirectoryInExePath = True NeedCurrentDirectoryForExePathW = False GetCurrentDirectoryW (not called) SearchPathW (not called) Overall = False (continue search) Best, Erich

2 1

[PATCH v7 1/6] kernel32/tests: Fix NtAllocateVirtualMemory tests results on w1064v1809
by Rémi Bernon 05 Jun '19

05 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 474955630fd..d797df26f6c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -456,12 +456,13 @@ static void test_VirtualAlloc(void) ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - /* 21 zero bits is valid */ + /* 21 zero bits never succeeds */ size = 0x1000; addr2 = NULL; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + todo_wine + ok(status == STATUS_NO_MEMORY || status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); @@ -470,7 +471,8 @@ static void test_VirtualAlloc(void) addr2 = NULL; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER_3 || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ @@ -484,8 +486,8 @@ static void test_VirtualAlloc(void) addr2 = (char *)addr1 + 0x1000; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); - todo_wine - ok(status == STATUS_INVALID_PARAMETER_5, "NtAllocateVirtualMemory returned %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER_5 || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } -- 2.20.1

3 11

[PATCH] d3drm: CreateDevice is unimplemented on Windows.
by Jeff Smith 04 Jun '19

04 Jun '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3drm/d3drm.c | 44 +++++++++++--------------------- dlls/d3drm/tests/d3drm.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 29 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index d0f20235a8..cba89e40cc 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -416,17 +416,13 @@ static HRESULT WINAPI d3drm1_CreateMaterial(IDirect3DRM *iface, static HRESULT WINAPI d3drm1_CreateDevice(IDirect3DRM *iface, DWORD width, DWORD height, IDirect3DRMDevice **device) { - struct d3drm_device *object; - HRESULT hr; - - FIXME("iface %p, width %u, height %u, device %p partial stub!\n", iface, width, height, device); + TRACE("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); - if (FAILED(hr = d3drm_device_create(&object, iface))) - return hr; - - *device = &object->IDirect3DRMDevice_iface; + if (!device) + return D3DRMERR_BADVALUE; + *device = NULL; - return D3DRM_OK; + return D3DRMERR_BADDEVICE; } static HRESULT WINAPI d3drm1_CreateDeviceFromSurface(IDirect3DRM *iface, GUID *guid, @@ -972,18 +968,13 @@ static HRESULT WINAPI d3drm2_CreateMaterial(IDirect3DRM2 *iface, static HRESULT WINAPI d3drm2_CreateDevice(IDirect3DRM2 *iface, DWORD width, DWORD height, IDirect3DRMDevice2 **device) { - struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); - struct d3drm_device *object; - HRESULT hr; - - FIXME("iface %p, width %u, height %u, device %p partial stub!\n", iface, width, height, device); - - if (FAILED(hr = d3drm_device_create(&object, &d3drm->IDirect3DRM_iface))) - return hr; + TRACE("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); - *device = &object->IDirect3DRMDevice2_iface; + if (!device) + return D3DRMERR_BADVALUE; + *device = NULL; - return D3DRM_OK; + return D3DRMERR_BADDEVICE; } static HRESULT WINAPI d3drm2_CreateDeviceFromSurface(IDirect3DRM2 *iface, GUID *guid, @@ -1611,18 +1602,13 @@ static HRESULT WINAPI d3drm3_CreateMaterial(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_CreateDevice(IDirect3DRM3 *iface, DWORD width, DWORD height, IDirect3DRMDevice3 **device) { - struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); - struct d3drm_device *object; - HRESULT hr; - - FIXME("iface %p, width %u, height %u, device %p partial stub!\n", iface, width, height, device); + TRACE("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); - if (FAILED(hr = d3drm_device_create(&object, &d3drm->IDirect3DRM_iface))) - return hr; - - *device = &object->IDirect3DRMDevice3_iface; + if (!device) + return D3DRMERR_BADVALUE; + *device = NULL; - return D3DRM_OK; + return D3DRMERR_BADDEVICE; } static HRESULT WINAPI d3drm3_CreateDeviceFromSurface(IDirect3DRM3 *iface, GUID *guid, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 2fb2699f36..cc4f8fe16a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5370,6 +5370,68 @@ static void test_create_device_from_d3d3(void) DestroyWindow(window); } +static void test_create_device_1(void) +{ + IDirect3DRM *d3drm = NULL; + IDirect3DRMDevice *device = (IDirect3DRMDevice *)0xdeadbeef; + HRESULT hr; + + hr = Direct3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); + + hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, &device); + ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr); + ok(device == NULL, "Expected device returned == NULL, got %p.\n", device); + hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + + IDirect3DRM_Release(d3drm); +} + +static void test_create_device_2(void) +{ + IDirect3DRM *d3drm = NULL; + IDirect3DRM2 *d3drm2 = NULL; + IDirect3DRMDevice2 *device2 = (IDirect3DRMDevice2 *)0xdeadbeef; + HRESULT hr; + + hr = Direct3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); + hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); + + hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, &device2); + ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr); + ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2); + hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm); +} + +static void test_create_device_3(void) +{ + IDirect3DRM *d3drm = NULL; + IDirect3DRM3 *d3drm3 = NULL; + IDirect3DRMDevice3 *device3 = (IDirect3DRMDevice3 *)0xdeadbeef; + HRESULT hr; + + hr = Direct3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); + hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); + + hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, &device3); + ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr); + ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3); + hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + + IDirect3DRM3_Release(d3drm3); + IDirect3DRM_Release(d3drm); +} + static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) { unsigned int bpp = palettized ? 8 : 24; @@ -7432,6 +7494,9 @@ START_TEST(d3drm) test_create_device_from_d3d1(); test_create_device_from_d3d2(); test_create_device_from_d3d3(); + test_create_device_1(); + test_create_device_2(); + test_create_device_3(); test_load_texture(); test_texture_qi(); test_viewport_qi(); -- 2.14.3

6 10

[PATCH 1/5] wined3d: Scale transformed position in compute_light().
by Paul Gofman 04 Jun '19

04 Jun '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 91ae2e34ae..925ae96aa7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3441,8 +3441,8 @@ static void compute_light(struct wined3d_color *ambient, struct wined3d_color *d float att; wined3d_vec4_transform(&position_transformed, position, &ls->modelview_matrix); + wined3d_vec3_scale((struct wined3d_vec3 *)&position_transformed, 1.0f / position_transformed.w); position_transformed_normalised = *(const struct wined3d_vec3 *)&position_transformed; - wined3d_vec3_scale(&position_transformed_normalised, 1.0f / position_transformed.w); wined3d_vec3_normalise(&position_transformed_normalised); if (normal) -- 2.21.0

4 12

[v2 PATCH] mshtml: Implement IHTMLDocument2 put/get_bgColor
by Alistair Leslie-Hughes 04 Jun '19

04 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mshtml/htmldoc.c | 42 +++++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 30 +++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5b14678a6f..160834cd5b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -680,15 +680,49 @@ static HRESULT WINAPI HTMLDocument_get_alinkColor(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_bgColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsresult nsres; + nsAString nsstr; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BSTR) + { + FIXME("Unsupported type (%d)\n", V_VT(&v)); + return E_INVALIDARG; + } + + nsAString_InitDepend(&nsstr, V_BSTR(&v)); + nsres = nsIDOMHTMLDocument_SetBgColor(This->doc_node->nsdoc, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetBgColor failed: %08x\n", nsres); + return E_INVALIDARG; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLDocument_GetBgColor(This->doc_node->nsdoc, &nsstr); + if(NS_FAILED(nsres)) + return E_FAIL; + + hres = return_nsstr_variant(nsres, &nsstr, p); + if(hres == S_OK) + { + static const WCHAR defaultcolor[] = {'#','f','f','f','f','f','f',0}; + if(!V_BSTR(p)) + V_BSTR(p) = SysAllocString(defaultcolor); + } + return hres; } static HRESULT WINAPI HTMLDocument_put_fgColor(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d46c232f9b..d5aecfc57d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -9868,6 +9868,35 @@ static void test_doctype(IHTMLDocument2 *doc) IHTMLDOMNode_Release(doctype); } +static void test_background_color(IHTMLDocument2 *doc) +{ + static WCHAR newcolor[] = {'#','f','f','0','0','0','0',0}; + HRESULT hres; + IHTMLDocument2 *doc_node; + VARIANT color; + + doc_node = get_doc_node(doc); + hres = IHTMLDocument2_get_bgColor(doc_node, &color); + ok(hres == S_OK, "failed: %08x\n", hres); + ok(V_VT(&color) == VT_BSTR, "type failed: %d\n", V_VT(&color)); + ok(!strcmp_wa(V_BSTR(&color), "#ffffff"), "str=%s\n", wine_dbgstr_w(V_BSTR(&color))); + VariantClear(&color); + + V_VT(&color) = VT_BSTR; + V_BSTR(&color) = SysAllocString(newcolor); + hres = IHTMLDocument2_put_bgColor(doc_node, color); + ok(hres == S_OK, "failed: %08x\n", hres); + VariantClear(&color); + + hres = IHTMLDocument2_get_bgColor(doc_node, &color); + ok(hres == S_OK, "failed: %08x\n", hres); + ok(V_VT(&color) == VT_BSTR, "type failed: %d\n", V_VT(&color)); + ok(!strcmp_wa(V_BSTR(&color), "#ff0000"), "str=%s\n", wine_dbgstr_w(V_BSTR(&color))); + VariantClear(&color); + + IHTMLDocument2_Release(doc_node); +} + static void test_null_write(IHTMLDocument2 *doc) { HRESULT hres; @@ -11032,6 +11061,7 @@ START_TEST(dom) run_domtest(emptydiv_str, test_docfrag); run_domtest(doc_blank, test_replacechild_elems); run_domtest(doctype_str, test_doctype); + run_domtest(doctype_str, test_background_color); test_quirks_mode(); -- 2.17.1

2 1

[PATCH 1/3] ole32: Add VT_ARRAY support to PropVariant.
by Sven Baars 04 Jun '19

04 Jun '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This should fix some memory leaks where PropVariantClear is expected to destroy the safearray. dlls/ole32/ole2.c | 26 ++++++++++++++ dlls/ole32/tests/propvariant.c | 63 ++++++++++++++++++++++++---------- 2 files changed, 70 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 2de9edbb80..fa39abe2de 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2797,6 +2797,25 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_FILETIME|VT_VECTOR: case VT_CF|VT_VECTOR: case VT_CLSID|VT_VECTOR: + case VT_ARRAY|VT_I1: + case VT_ARRAY|VT_UI1: + case VT_ARRAY|VT_I2: + case VT_ARRAY|VT_UI2: + case VT_ARRAY|VT_I4: + case VT_ARRAY|VT_UI4: + case VT_ARRAY|VT_INT: + case VT_ARRAY|VT_UINT: + case VT_ARRAY|VT_R4: + case VT_ARRAY|VT_R8: + case VT_ARRAY|VT_CY: + case VT_ARRAY|VT_DATE: + case VT_ARRAY|VT_BSTR: + case VT_ARRAY|VT_BOOL: + case VT_ARRAY|VT_DECIMAL: + case VT_ARRAY|VT_DISPATCH: + case VT_ARRAY|VT_UNKNOWN: + case VT_ARRAY|VT_ERROR: + case VT_ARRAY|VT_VARIANT: return S_OK; } WARN("Bad type %d\n", vt); @@ -2908,6 +2927,8 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ CoTaskMemFree(pvar->u.capropvar.pElems); } } + else if (pvar->vt & VT_ARRAY) + hr = SafeArrayDestroy(pvar->u.parray); else { WARN("Invalid/unsupported type %d\n", pvar->vt); @@ -3088,6 +3109,11 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ else CopyMemory(pvarDest->u.capropvar.pElems, pvarSrc->u.capropvar.pElems, len * elemSize); } + else if (pvarSrc->vt & VT_ARRAY) + { + pvarDest->u.uhVal.QuadPart = 0; + return SafeArrayCopy(pvarSrc->u.parray, &pvarDest->u.parray); + } else WARN("Invalid/unsupported type %d\n", pvarSrc->vt); } diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 8c9f79e8d6..18ecfa6528 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -46,28 +46,28 @@ static const struct valid_mapping { { PROP_V0 , PROP_INV, PROP_INV, PROP_INV }, /* VT_EMPTY */ { PROP_V0 , PROP_INV, PROP_INV, PROP_INV }, /* VT_NULL */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I2 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I4 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R4 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R8 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_CY */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_DATE */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BSTR */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DISPATCH */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_ERROR */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BOOL */ - { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_VARIANT */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I2 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I4 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R4 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R8 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_CY */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_DATE */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BSTR */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DISPATCH */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_ERROR */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BOOL */ + { PROP_V1 | PROP_TODO , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_VARIANT */ + { PROP_V1 , PROP_V1, PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* 15 */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_I1 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI1 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI2 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */ + { PROP_V1 , PROP_V1 , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_I1 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI1 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI2 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */ { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_I8 */ { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_UI8 */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_INT */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UINT */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_INT */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UINT */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_VOID */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_HRESULT */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_PTR */ @@ -351,6 +351,9 @@ static void test_copy(void) struct unk_impl unk_obj = {{&unk_vtbl}, 1}; PROPVARIANT propvarSrc; PROPVARIANT propvarDst; + SAFEARRAY *sa; + SAFEARRAYBOUND sabound; + LONG saindex; HRESULT hr; propvarSrc.vt = VT_BSTR; @@ -392,6 +395,28 @@ static void test_copy(void) ok(hr == S_OK, "PropVariantClear(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); memset(&propvarSrc, 0, sizeof(propvarSrc)); + + sabound.lLbound = 0; + sabound.cElements = 2; + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sabound); + saindex = 0; + SafeArrayPutElement(sa, &saindex, &unk_obj.IUnknown_iface); + saindex = 1; + SafeArrayPutElement(sa, &saindex, &unk_obj.IUnknown_iface); + ok(unk_obj.ref == 3, "got wrong refcount: %d.\n", unk_obj.ref); + + propvarSrc.vt = VT_ARRAY | VT_UNKNOWN; + U(propvarSrc).parray = sa; + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == S_OK, "PropVariantCopy(...VT_ARRAY|VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 5, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarDst); + ok(hr == S_OK, "PropVariantClear(...VT_ARRAY|VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 3, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarSrc); + ok(hr == S_OK, "PropVariantClear(...VT_ARRAY|VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); + memset(&propvarSrc, 0, sizeof(propvarSrc)); } struct _PMemoryAllocator_vtable { -- 2.17.1

2 3

[PATCH] taskschd: Fix some server binding handle leaks (Valgrind).
by Sven Baars 03 Jun '19

03 Jun '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/taskschd/task.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 54b678244b..2a1d0d42b3 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3691,6 +3691,8 @@ static ULONG WINAPI TaskService_Release(ITaskService *iface) { TRACE("destroying %p\n", iface); heap_free(task_svc); + if (rpc_handle) + RpcBindingFree(&rpc_handle); } return ref; @@ -3881,11 +3883,14 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V hr = start_schedsvc(); if (hr != S_OK) return hr; - hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); - if (hr != RPC_S_OK) return hr; - hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); - RpcStringFreeW(&binding_str); - if (hr != RPC_S_OK) return hr; + if (!rpc_handle) + { + hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); + if (hr != RPC_S_OK) return hr; + hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); + RpcStringFreeW(&binding_str); + if (hr != RPC_S_OK) return hr; + } /* Make sure that the connection works */ hr = SchRpcHighestVersion(&task_svc->version); -- 2.17.1

2 2

[PATCH 1/3] include/mshtml.idl: Add more interface declarations.
by Dmitry Timoshkov 03 Jun '19

03 Jun '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/mshtmdid.h | 32 ++++- include/mshtml.idl | 342 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 356 insertions(+), 18 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index a8c010d3b1..82055f690b 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -38,9 +38,11 @@ #define DISPID_HEADER DISPID_NORMAL_FIRST #define DISPID_HEDELEMS DISPID_NORMAL_FIRST #define DISPID_HR DISPID_NORMAL_FIRST +#define DISPID_IHTMLCOMPUTEDSTYLE DISPID_NORMAL_FIRST +#define DISPID_ILINEINFO DISPID_NORMAL_FIRST +#define DISPID_IMGBASE DISPID_NORMAL_FIRST #define DISPID_LABEL DISPID_NORMAL_FIRST #define DISPID_LI DISPID_NORMAL_FIRST -#define DISPID_IMGBASE DISPID_NORMAL_FIRST #define DISPID_MENU DISPID_NORMAL_FIRST #define DISPID_OL DISPID_NORMAL_FIRST #define DISPID_PARA DISPID_NORMAL_FIRST @@ -1683,6 +1685,34 @@ #define DISPID_IHTMLDOCUMENT8_ONMSMANIPULATIONSTATECHANGED DISPID_EVPROP_ONMSMANIPULATIONSTATECHANGED #define DISPID_IHTMLDOCUMENT8_MSCAPSLOCKWARNINGOFF DISPID_OMDOCUMENT+141 +/* ILineInfo */ +#define DISPID_ILINEINFO_X (DISPID_ILINEINFO+1) +#define DISPID_ILINEINFO_BASELINE (DISPID_ILINEINFO+2) +#define DISPID_ILINEINFO_TEXTDESCENT (DISPID_ILINEINFO+3) +#define DISPID_ILINEINFO_TEXTHEIGHT (DISPID_ILINEINFO+4) +#define DISPID_ILINEINFO_LINEDIRECTION (DISPID_ILINEINFO+5) + +/* IHTMLComputedStyle */ +#define DISPID_IHTMLCOMPUTEDSTYLE_BOLD (DISPID_IHTMLCOMPUTEDSTYLE+1) +#define DISPID_IHTMLCOMPUTEDSTYLE_ITALIC (DISPID_IHTMLCOMPUTEDSTYLE+2) +#define DISPID_IHTMLCOMPUTEDSTYLE_UNDERLINE (DISPID_IHTMLCOMPUTEDSTYLE+3) +#define DISPID_IHTMLCOMPUTEDSTYLE_OVERLINE (DISPID_IHTMLCOMPUTEDSTYLE+4) +#define DISPID_IHTMLCOMPUTEDSTYLE_STRIKEOUT (DISPID_IHTMLCOMPUTEDSTYLE+5) +#define DISPID_IHTMLCOMPUTEDSTYLE_SUBSCRIPT (DISPID_IHTMLCOMPUTEDSTYLE+6) +#define DISPID_IHTMLCOMPUTEDSTYLE_SUPERSCRIPT (DISPID_IHTMLCOMPUTEDSTYLE+7) +#define DISPID_IHTMLCOMPUTEDSTYLE_EXPLICITFACE (DISPID_IHTMLCOMPUTEDSTYLE+8) +#define DISPID_IHTMLCOMPUTEDSTYLE_FONTWEIGHT (DISPID_IHTMLCOMPUTEDSTYLE+9) +#define DISPID_IHTMLCOMPUTEDSTYLE_FONTSIZE (DISPID_IHTMLCOMPUTEDSTYLE+10) +#define DISPID_IHTMLCOMPUTEDSTYLE_FONTNAME (DISPID_IHTMLCOMPUTEDSTYLE+11) +#define DISPID_IHTMLCOMPUTEDSTYLE_HASBGCOLOR (DISPID_IHTMLCOMPUTEDSTYLE+12) +#define DISPID_IHTMLCOMPUTEDSTYLE_TEXTCOLOR (DISPID_IHTMLCOMPUTEDSTYLE+13) +#define DISPID_IHTMLCOMPUTEDSTYLE_BACKGROUNDCOLOR (DISPID_IHTMLCOMPUTEDSTYLE+14) +#define DISPID_IHTMLCOMPUTEDSTYLE_PREFORMATTED (DISPID_IHTMLCOMPUTEDSTYLE+15) +#define DISPID_IHTMLCOMPUTEDSTYLE_DIRECTION (DISPID_IHTMLCOMPUTEDSTYLE+16) +#define DISPID_IHTMLCOMPUTEDSTYLE_BLOCKDIRECTION (DISPID_IHTMLCOMPUTEDSTYLE+17) +#define DISPID_IHTMLCOMPUTEDSTYLE_OL (DISPID_IHTMLCOMPUTEDSTYLE+18) +#define DISPID_IHTMLCOMPUTEDSTYLE_ISEQUAL + /* DWebBridgeEvents */ #define DISPID_DWEBBRIDGEEVENTS_ONSCRIPTLETEVENT 1 #define DISPID_DWEBBRIDGEEVENTS_ONREADYSTATECHANGE DISPID_HTMLDOCUMENTEVENTS_ONREADYSTATECHANGE diff --git a/include/mshtml.idl b/include/mshtml.idl index 7cc9e93af2..de15c6c2ce 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -45,6 +45,15 @@ cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef FindText") cpp_quote("#endif") +[ + version(4.0), + uuid(3050F1C5-98B5-11CF-BB82-00AA00BDCE0B) +] +library MSHTML +{ + +importlib("stdole2.tlb"); + typedef enum { POINTER_GRAVITY_Left, POINTER_GRAVITY_Right, @@ -100,14 +109,155 @@ typedef enum _SELECTION_TYPE { SELECTION_TYPE_Max = 2147483647 } SELECTION_TYPE; -[ - version(4.0), - uuid(3050F1C5-98B5-11CF-BB82-00AA00BDCE0B) -] -library MSHTML -{ - -importlib("stdole2.tlb"); +typedef enum _ELEMENT_TAG_ID { + TAGID_NULL, + TAGID_UNKNOWN, + TAGID_A, + TAGID_ACRONYM, + TAGID_ADDRESS, + TAGID_APPLET, + TAGID_AREA, + TAGID_B, + TAGID_BASE, + TAGID_BASEFONT, + TAGID_BDO, + TAGID_BGSOUND, + TAGID_BIG, + TAGID_BLINK, + TAGID_BLOCKQUOTE, + TAGID_BODY, + TAGID_BR, + TAGID_BUTTON, + TAGID_CAPTION, + TAGID_CENTER, + TAGID_CITE, + TAGID_CODE, + TAGID_COL, + TAGID_COLGROUP, + TAGID_COMMENT, + TAGID_COMMENT_RAW, + TAGID_DD, + TAGID_DEL, + TAGID_DFN, + TAGID_DIR, + TAGID_DIV, + TAGID_DL, + TAGID_DT, + TAGID_EM, + TAGID_EMBED, + TAGID_FIELDSET, + TAGID_FONT, + TAGID_FORM, + TAGID_FRAME, + TAGID_FRAMESET, + TAGID_GENERIC, + TAGID_H1, + TAGID_H2, + TAGID_H3, + TAGID_H4, + TAGID_H5, + TAGID_H6, + TAGID_HEAD, + TAGID_HR, + TAGID_HTML, + TAGID_I, + TAGID_IFRAME, + TAGID_IMG, + TAGID_INPUT, + TAGID_INS, + TAGID_KBD, + TAGID_LABEL, + TAGID_LEGEND, + TAGID_LI, + TAGID_LINK, + TAGID_LISTING, + TAGID_MAP, + TAGID_MARQUEE, + TAGID_MENU, + TAGID_META, + TAGID_NEXTID, + TAGID_NOBR, + TAGID_NOEMBED, + TAGID_NOFRAMES, + TAGID_NOSCRIPT, + TAGID_OBJECT, + TAGID_OL, + TAGID_OPTION, + TAGID_P, + TAGID_PARAM, + TAGID_PLAINTEXT, + TAGID_PRE, + TAGID_Q, + TAGID_RP, + TAGID_RT, + TAGID_RUBY, + TAGID_S, + TAGID_SAMP, + TAGID_SCRIPT, + TAGID_SELECT, + TAGID_SMALL, + TAGID_SPAN, + TAGID_STRIKE, + TAGID_STRONG, + TAGID_STYLE, + TAGID_SUB, + TAGID_SUP, + TAGID_TABLE, + TAGID_TBODY, + TAGID_TC, + TAGID_TD, + TAGID_TEXTAREA, + TAGID_TFOOT, + TAGID_TH, + TAGID_THEAD, + TAGID_TITLE, + TAGID_TR, + TAGID_TT, + TAGID_U, + TAGID_UL, + TAGID_VAR, + TAGID_WBR, + TAGID_XMP, + TAGID_ROOT, + TAGID_OPTGROUP, + TAGID_ABBR, + TAGID_COUNT, + TAGID_LAST_PREDEFINED = 10000, + ELEMENT_TAG_ID_Max = 2147483647 +} ELEMENT_TAG_ID; + +typedef enum _COORD_SYSTEM { + COORD_SYSTEM_GLOBAL, + COORD_SYSTEM_PARENT, + COORD_SYSTEM_CONTAINER, + COORD_SYSTEM_CONTENT, + COORD_SYSTEM_FRAME, + COORD_SYSTEM_Max = 2147483647 +} COORD_SYSTEM; + +typedef enum _DISPLAY_MOVEUNIT { + DISPLAY_MOVEUNIT_PreviousLine = 1, + DISPLAY_MOVEUNIT_NextLine, + DISPLAY_MOVEUNIT_CurrentLineStart, + DISPLAY_MOVEUNIT_CurrentLineEnd, + DISPLAY_MOVEUNIT_TopOfWindow, + DISPLAY_MOVEUNIT_BottomOfWindow, + DISPLAY_MOVEUNIT_Max = 2147483647 +} DISPLAY_MOVEUNIT; + +typedef enum _DISPLAY_GRAVITY { + DISPLAY_GRAVITY_PreviousLine = 1, + DISPLAY_GRAVITY_NextLine, + DISPLAY_GRAVITY_Max = 2147483647 +} DISPLAY_GRAVITY; + +typedef enum _CARET_DIRECTION { + CARET_DIRECTION_INDETERMINATE, + CARET_DIRECTION_SAME, + CARET_DIRECTION_BACKWARD, + CARET_DIRECTION_FORWARD, + CARET_DIRECTION_Max = 2147483647 +} CARET_DIRECTION; typedef enum _DomConstructor { DomConstructorObject = 0, @@ -245,13 +395,25 @@ interface IHTMLDOMConstructor : IDispatch [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] \ IDispatch *constructor() +interface IHTMLCaret; +interface IHTMLComputedStyle; interface IHTMLDocument2; interface IHTMLDocument7; +interface IHTMLElement; interface IHTMLElement2; -interface IHTMLStyleSheetsCollection; +interface IHTMLElementCollection; +interface IHTMLEventObj; interface IHTMLFrameBase; interface IHTMLStorage; +interface IHTMLStyleSheetsCollection; +interface IHTMLTableSection; interface IDOMEvent; +interface IDisplayPointer; +interface IDisplayServices; +interface ILineInfo; +interface IMarkupPointer; +interface IMarkupContainer; +interface ISVGSVGElement; /***************************************************************************** * IHTMLCSSStyleDeclaration interface @@ -8706,8 +8868,6 @@ methods: IDispatch *item([in] LONG index); } -interface IHTMLElementCollection; - /***************************************************************************** * IHTMLElement interface */ @@ -12518,8 +12678,6 @@ methods: VARIANT_BOOL onreset(); } -interface IHTMLEventObj; - [ hidden, uuid(3050F614-98B5-11CF-BB82-00AA00BDCE0B) @@ -16122,8 +16280,6 @@ interface ISVGAnimatedEnumeration : IDispatch HRESULT animVal([out, retval] USHORT *p); } -interface ISVGSVGElement; - /***************************************************************************** * ISVGElement interface */ @@ -25111,8 +25267,6 @@ interface IHTMLTableCaption : IDispatch HRESULT vAlign([retval, out] BSTR *p); } -interface IHTMLTableSection; - /***************************************************************************** * IHTMLTable interface */ @@ -27871,6 +28025,160 @@ interface IDOMMessageEvent : IDispatch [in] IHTMLWindow2 *source); } +/***************************************************************************** + * ILineInfo interface + */ +[ + object, + pointer_default(unique), + uuid(3050f7e2-98b5-11cf-bb82-00aa00bdce0b) +] +interface ILineInfo : IUnknown +{ + [propget, id(DISPID_ILINEINFO_X)] HRESULT x([retval, out] long *p); + [propget, id(DISPID_ILINEINFO_BASELINE)] HRESULT baseLine([retval, out] long *p); + [propget, id(DISPID_ILINEINFO_TEXTDESCENT)] HRESULT textDescent([retval, out] long *p); + [propget, id(DISPID_ILINEINFO_TEXTHEIGHT)] HRESULT textHeight([retval, out] long *p); + [propget, id(DISPID_ILINEINFO_LINEDIRECTION)] HRESULT lineDirection([retval, out] long *p); +}; + +/***************************************************************************** + * IHTMLComputedStyle interface + */ +[ + object, + pointer_default(unique), + uuid(3050f6c3-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLComputedStyle : IUnknown +{ + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BOLD)] HRESULT bold([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_ITALIC)] HRESULT italic([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_UNDERLINE)] HRESULT underline([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_OVERLINE)] HRESULT overline([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_STRIKEOUT)] HRESULT strikeOut([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUBSCRIPT)] HRESULT subScript([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUPERSCRIPT)] HRESULT superScript([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_EXPLICITFACE)] HRESULT explicitFace([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTWEIGHT)] HRESULT fontWeight([retval, out] long **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTSIZE)] HRESULT fontSize([retval, out] long **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTNAME)] HRESULT fontName([retval, out] WCHAR **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_HASBGCOLOR)] HRESULT hasBgColor([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_TEXTCOLOR)] HRESULT textColor([retval, out] DWORD **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BACKGROUNDCOLOR)] HRESULT backgroundColor([retval, out] DWORD **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_PREFORMATTED)] HRESULT *preFormatted([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_DIRECTION)] HRESULT direction([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BLOCKDIRECTION)] HRESULT blockDirection([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_OL)] HRESULT OL([retval, out] VARIANT_BOOL *p); + HRESULT IsEqual([in] IHTMLComputedStyle *pComputedStyle,[out] VARIANT_BOOL *pfEqual); +}; + +/***************************************************************************** + * IDisplayPointer interface + */ +[ + object, + pointer_default(unique), + uuid(3050f69e-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDisplayPointer : IUnknown +{ + HRESULT MoveToPoint([in] POINT ptPoint,[in] COORD_SYSTEM eCoordSystem,[in] IHTMLElement *pElementContext,[in] DWORD dwHitTestOptions,[out] DWORD *pdwHitTestResults); + HRESULT MoveUnit([in] DISPLAY_MOVEUNIT eMoveUnit,[in] LONG lXPos); + HRESULT PositionMarkupPointer([in] IMarkupPointer *pMarkupPointer); + HRESULT MoveToPointer([in] IDisplayPointer *pDispPointer); + HRESULT SetPointerGravity([in] POINTER_GRAVITY eGravity); + HRESULT GetPointerGravity([out] POINTER_GRAVITY *peGravity); + HRESULT SetDisplayGravity([in] DISPLAY_GRAVITY eGravity); + HRESULT GetDisplayGravity([out] DISPLAY_GRAVITY *peGravity); + HRESULT IsPositioned([out] BOOL *pfPositioned); + HRESULT Unposition(); + HRESULT IsEqualTo([in] IDisplayPointer *pDispPointer,[out] BOOL *pfIsEqual); + HRESULT IsLeftOf([in] IDisplayPointer *pDispPointer,[out] BOOL *pfIsLeftOf); + HRESULT IsRightOf([in] IDisplayPointer *pDispPointer,[out] BOOL *pfIsRightOf); + HRESULT IsAtBOL([out] BOOL *pfBOL); + HRESULT MoveToMarkupPointer([in] IMarkupPointer *pPointer,[in] IDisplayPointer *pDispLineContext); + HRESULT ScrollIntoView(); + HRESULT GetLineInfo([out] ILineInfo **ppLineInfo); + HRESULT GetFlowElement([out] IHTMLElement **ppLayoutElement); + HRESULT QueryBreaks([out] DWORD *pdwBreaks); +}; + +/***************************************************************************** + * IHTMLCaret interface + */ +[ + object, + pointer_default(unique), + uuid(3050f604-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLCaret : IUnknown +{ + HRESULT MoveCaretToPointer([in] IDisplayPointer *pDispPointer,[in] BOOL fScrollIntoView,[in] CARET_DIRECTION eDir); + HRESULT MoveCaretToPointerEx([in] IDisplayPointer *pDispPointer,[in] BOOL fVisible,[in] BOOL fScrollIntoView,[in] CARET_DIRECTION eDir); + HRESULT MoveMarkupPointerToCaret([in] IMarkupPointer *pIMarkupPointer); + HRESULT MoveDisplayPointerToCaret([in] IDisplayPointer *pDispPointer); + HRESULT IsVisible([out] BOOL *pIsVisible); + HRESULT Show([in] BOOL fScrollIntoView); + HRESULT Hide(); + HRESULT InsertText([in] OLECHAR *pText,[in] LONG lLen); + HRESULT ScrollIntoView(); + HRESULT GetLocation([out] POINT *pPoint,[in] BOOL fTranslate); + HRESULT GetCaretDirection([out] CARET_DIRECTION *peDir); + HRESULT SetCaretDirection([in] CARET_DIRECTION eDir); +}; + +/***************************************************************************** + * IDisplayServices interface + */ +[ + object, + pointer_default(unique), + uuid(3050f69d-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDisplayServices : IUnknown +{ + HRESULT CreateDisplayPointer([out] IDisplayPointer **ppDispPointer); + HRESULT TransformRect([in, out] RECT *pRect,[in] COORD_SYSTEM eSource,[in] COORD_SYSTEM eDestination,[in] IHTMLElement *pIElement); + HRESULT TransformPoint([in, out] POINT *pPoint,[in] COORD_SYSTEM eSource,[in] COORD_SYSTEM eDestination,[in] IHTMLElement *pIElement); + HRESULT GetCaret([out] IHTMLCaret **ppCaret); + HRESULT GetComputedStyle([in] IMarkupPointer *pPointer,[out] IHTMLComputedStyle **ppComputedStyle); + HRESULT ScrollRectIntoView([in] IHTMLElement *pIElement,[in] RECT rect); + HRESULT HasFlowLayout([in] IHTMLElement *pIElement,[out] BOOL *pfHasFlowLayout); +}; + +/***************************************************************************** + * IMarkupServices interface + */ +[ + object, + pointer_default(unique), + uuid(3050f4a0-98b5-11cf-bb82-00aa00bdce0b) +] +interface IMarkupServices : IUnknown +{ + HRESULT CreateMarkupPointer([out] IMarkupPointer **ppPointer); + HRESULT CreateMarkupContainer([out] IMarkupContainer **ppMarkupContainer); + HRESULT CreateElement([in] ELEMENT_TAG_ID tagID,[in] OLECHAR *pchAttributes,[out] IHTMLElement **ppElement); + HRESULT CloneElement([in] IHTMLElement *pElemCloneThis,[out] IHTMLElement **ppElementTheClone); + HRESULT InsertElement([in] IHTMLElement *pElementInsert,[in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish); + HRESULT RemoveElement([in] IHTMLElement *pElementRemove); + HRESULT Remove([in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish); + HRESULT Copy([in] IMarkupPointer *pPointerSourceStart,[in] IMarkupPointer *pPointerSourceFinish,[in] IMarkupPointer *pPointerTarget); + HRESULT Move([in] IMarkupPointer *pPointerSourceStart,[in] IMarkupPointer *pPointerSourceFinish,[in] IMarkupPointer *pPointerTarget); + HRESULT InsertText([in] OLECHAR *pchText,[in] long cch,[in] IMarkupPointer *pPointerTarget); + HRESULT ParseString([in] OLECHAR *pchHTML,[in] DWORD dwFlags,[out] IMarkupContainer **ppContainerResult,[in] IMarkupPointer *ppPointerStart,[in] IMarkupPointer *ppPointerFinish); + HRESULT ParseGlobal([in] HGLOBAL hglobalHTML,[in] DWORD dwFlags,[out] IMarkupContainer **ppContainerResult,[in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish); + HRESULT IsScopedElement([in] IHTMLElement *pElement,[out] BOOL *pfScoped); + HRESULT GetElementTagId([in] IHTMLElement *pElement,[out] ELEMENT_TAG_ID *ptagId); + HRESULT GetTagIDForName([in] BSTR bstrName,[out] ELEMENT_TAG_ID *ptagId); + HRESULT GetNameForTagID([in] ELEMENT_TAG_ID tagId,[out] BSTR *pbstrName); + HRESULT MovePointersToRange([in] IHTMLTxtRange *pIRange,[in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish); + HRESULT MoveRangeToPointers([in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish,[in] IHTMLTxtRange *pIRange); + HRESULT BeginUndoUnit([in] OLECHAR *pchTitle); + HRESULT EndUndoUnit(); +}; + /***************************************************************************** * IMarkupContainer interface */ -- 2.20.1

3 5

[PATCH 1/2] wined3d: Zero-initialize the swapchain context array.
by Matteo Bruni 03 Jun '19

03 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47255 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Fixes a regression from commit db201072655946662c041a66ee434c30c245e5b0. dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index fbedd7470df..48d0920554d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -892,7 +892,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 if (!(device->wined3d->flags & WINED3D_NO3D)) { - if (!(swapchain->context = heap_alloc(sizeof(*swapchain->context)))) + if (!(swapchain->context = heap_alloc_zero(sizeof(*swapchain->context)))) { ERR("Failed to create the context array.\n"); hr = E_OUTOFMEMORY; -- 2.21.0

2 2

Jump to page:

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 May 2019