June 2020 - Wine-devel - list.winehq.org

[PATCH v3 2/2] oleaut32: Retrieve funcdesc from TLB by memberid and invkind.
by Porot Mo 10 Jun '20

10 Jun '20

This allows ITypeInfo::GetDllEntry() to search exact property access functions which share same memberid. Signed-off-by: Porot Mo <porotmjp(a)gmail.com> --- v3: spilt tests and fix dlls/oleaut32/typelib.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)

2 3

[PATCH v2 4/4] prntvpt: Add some tests for PTOpenProvider and PTOpenProviderEx.
by Dmitry Timoshkov 10 Jun '20

10 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/prntvpt/tests/Makefile.in | 5 ++ dlls/prntvpt/tests/prntvpt.c | 148 +++++++++++++++++++++++++++++++++ include/prntvpt.h | 1 + 4 files changed, 155 insertions(+) create mode 100644 dlls/prntvpt/tests/Makefile.in create mode 100644 dlls/prntvpt/tests/prntvpt.c diff --git a/configure.ac b/configure.ac index e61a98455c..72276fc066 100644 --- a/configure.ac +++ b/configure.ac @@ -3616,6 +3616,7 @@ WINE_CONFIG_MAKEFILE(dlls/pidgen) WINE_CONFIG_MAKEFILE(dlls/powrprof) WINE_CONFIG_MAKEFILE(dlls/printui) WINE_CONFIG_MAKEFILE(dlls/prntvpt) +WINE_CONFIG_MAKEFILE(dlls/prntvpt/tests) WINE_CONFIG_MAKEFILE(dlls/propsys) WINE_CONFIG_MAKEFILE(dlls/propsys/tests) WINE_CONFIG_MAKEFILE(dlls/psapi) diff --git a/dlls/prntvpt/tests/Makefile.in b/dlls/prntvpt/tests/Makefile.in new file mode 100644 index 0000000000..692a134d01 --- /dev/null +++ b/dlls/prntvpt/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = prntvpt.dll +IMPORTS = prntvpt winspool ole32 + +C_SRCS = \ + prntvpt.c diff --git a/dlls/prntvpt/tests/prntvpt.c b/dlls/prntvpt/tests/prntvpt.c new file mode 100644 index 0000000000..55b6f3fdef --- /dev/null +++ b/dlls/prntvpt/tests/prntvpt.c @@ -0,0 +1,148 @@ +/* + * Copyright 2019 Dmitry Timoshkov + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winspool.h> +#include <objbase.h> +#include <prntvpt.h> + +#include "wine/test.h" + +static WCHAR default_name[256]; + +struct hprov_data +{ + HPTPROVIDER hprov; + HRESULT hr; +}; + +static DWORD WINAPI CloseProvider_proc(void *param) +{ + struct hprov_data *data = param; + + data->hr = PTCloseProvider(data->hprov); + + return 0; +} + +static void test_PTOpenProvider(void) +{ + DWORD tid, i; + HPTPROVIDER hprov; + HRESULT hr; + HANDLE hthread; + struct hprov_data data; + + hr = PTOpenProvider(default_name, 1, &hprov); + ok(hr == S_OK, "got %#x\n", hr); + + data.hprov = hprov; + hthread = CreateThread(NULL, 0, CloseProvider_proc, &data, 0, &tid); + WaitForSingleObject(hthread, INFINITE); + CloseHandle(hthread); + ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /* Win8 */, "got %#x\n", data.hr); + + if (data.hr != S_OK) + { + hr = PTCloseProvider(hprov); + ok(hr == S_OK, "got %#x\n", hr); + } + + hr = PTOpenProvider(default_name, 0, &hprov); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + for (i = 2; i < 20; i++) + { + hr = PTOpenProvider(default_name, i, &hprov); + ok(hr == 0x80040001 || hr == E_INVALIDARG /* Wine */, "%u: got %#x\n", i, hr); + } +} + +static void test_PTOpenProviderEx(void) +{ + DWORD tid, ver, i; + HPTPROVIDER hprov; + HRESULT hr; + HANDLE hthread; + struct hprov_data data; + + hr = PTOpenProviderEx(default_name, 1, 1, &hprov, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + ver = 0xdeadbeef; + hr = PTOpenProviderEx(default_name, 1, 1, &hprov, &ver); + ok(hr == S_OK, "got %#x\n", hr); + ok(ver == 1, "got %#x\n", ver); + + data.hprov = hprov; + hthread = CreateThread(NULL, 0, CloseProvider_proc, &data, 0, &tid); + WaitForSingleObject(hthread, INFINITE); + CloseHandle(hthread); + ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /* Win8 */, "got %#x\n", data.hr); + + if (data.hr != S_OK) + { + hr = PTCloseProvider(hprov); + ok(hr == S_OK, "got %#x\n", hr); + } + + for (i = 1; i < 20; i++) + { + hr = PTOpenProviderEx(default_name, 0, i, &hprov, &ver); + ok(hr == E_INVALIDARG, "%u: got %#x\n", i, hr); + + ver = 0xdeadbeef; + hr = PTOpenProviderEx(default_name, 1, i, &hprov, &ver); + ok(hr == S_OK, "%u: got %#x\n", i, hr); + ok(ver == 1, "%u: got %#x\n", i, ver); + PTCloseProvider(hprov); + + ver = 0xdeadbeef; + hr = PTOpenProviderEx(default_name, i, i, &hprov, &ver); + ok(hr == S_OK, "%u: got %#x\n", i, hr); + ok(ver == 1, "%u: got %#x\n", i, ver); + PTCloseProvider(hprov); + } +} + +START_TEST(prntvpt) +{ + DWORD size; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + size = ARRAY_SIZE(default_name); + if (!GetDefaultPrinterW(default_name, &size)) + { + skip("no default printer set\n"); + return; + } + + trace("default printer: %s\n", wine_dbgstr_w(default_name)); + + test_PTOpenProvider(); + test_PTOpenProviderEx(); + + CoUninitialize(); +} diff --git a/include/prntvpt.h b/include/prntvpt.h index 8b873dd0aa..a453f8cb37 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -27,6 +27,7 @@ DECLARE_HANDLE(HPTPROVIDER); HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version); +HRESULT WINAPI PTCloseProvider(HPTPROVIDER); #ifdef __cplusplus } -- 2.26.2

1 0

[PATCH v2 3/4] prntvpt: Implement PTCloseProvider.
by Dmitry Timoshkov 10 Jun '20

10 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/main.c | 21 +++++++++++++++++++++ dlls/prntvpt/prntvpt.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 9c12b0cbfa..dee5ca519a 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -57,6 +57,27 @@ HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) return E_NOTIMPL; } +static BOOL is_valid_provider(struct prn_provider *prov) +{ + return prov && prov->owner == GetCurrentThreadId(); +} + +HRESULT WINAPI PTCloseProvider(HPTPROVIDER provider) +{ + struct prn_provider *prov = (struct prn_provider *)provider; + + TRACE("%p\n", provider); + + if (!is_valid_provider(prov)) + return E_HANDLE; + + prov->owner = 0; + ClosePrinter(prov->hprn); + heap_free(prov); + + return S_OK; +} + HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provider) { DWORD used_version; diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 5581fa4c50..99c6708242 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,7 +1,7 @@ @ stdcall PTQuerySchemaVersionSupport(wstr ptr) @ stdcall PTOpenProvider(wstr long ptr) @ stdcall PTOpenProviderEx(wstr long long ptr ptr) -@ stub PTCloseProvider +@ stdcall PTCloseProvider(ptr) @ stub BindPTProviderThunk @ stub PTGetPrintCapabilities @ stub PTMergeAndValidatePrintTicket -- 2.26.2

1 0

[PATCH v2 2/4] prntvpt: Implement PTOpenProvider.
by Dmitry Timoshkov 10 Jun '20

10 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 902be87114..9c12b0cbfa 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -59,8 +59,13 @@ HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provider) { - FIXME("%s, %d, %p: stub\n", debugstr_w(printer), version, provider); - return E_NOTIMPL; + DWORD used_version; + + TRACE("%s, %d, %p\n", debugstr_w(printer), version, provider); + + if (version != 1) return E_INVALIDARG; + + return PTOpenProviderEx(printer, 1, 1, provider, &used_version); } HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version) -- 2.26.2

1 0

[PATCH v2 1/4] prntvpt: Implement PTOpenProviderEx.
by Dmitry Timoshkov 10 Jun '20

10 Jun '20

v2: Fix test failures under Windows 8. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/Makefile.in | 4 +++- dlls/prntvpt/main.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index 5efd1c4eb2..a3db8760c2 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -1,4 +1,6 @@ -MODULE = prntvpt.dll +MODULE = prntvpt.dll +IMPORTLIB = prntvpt +IMPORTS = winspool EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index ec7cf7c3e2..902be87114 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -22,11 +22,20 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" +#include "winspool.h" #include "prntvpt.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); +struct prn_provider +{ + DWORD owner; + HANDLE hprn; +}; + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { TRACE("(%p, %d, %p)\n", hinst, reason, reserved); @@ -42,7 +51,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) return TRUE; } - HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) { FIXME("stub:%s %p\n", debugstr_w(printer), version); @@ -57,6 +65,25 @@ HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provid HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version) { - FIXME("%s, %d, %d, %p, %p: stub\n", debugstr_w(printer), max_version, pref_version, provider, used_version); - return E_NOTIMPL; + struct prn_provider *prov; + + TRACE("%s, %d, %d, %p, %p\n", debugstr_w(printer), max_version, pref_version, provider, used_version); + + if (!max_version || !provider || !used_version) + return E_INVALIDARG; + + prov = heap_alloc(sizeof(*prov)); + if (!prov) return E_OUTOFMEMORY; + + if (!OpenPrinterW((LPWSTR)printer, &prov->hprn, NULL)) + { + heap_free(prov); + return HRESULT_FROM_WIN32(GetLastError()); + } + + prov->owner = GetCurrentThreadId(); + *provider = (HPTPROVIDER)prov; + *used_version = 1; + + return S_OK; } -- 2.26.2

1 0

[PATCH resend] winapi_test: Add/remove headers for urlmon test, in tests.dat.
by Serge Gautherie 10 Jun '20

10 Jun '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to b3da4abc5771a7542409412c41b3356255f248b2. --- tools/winapi/tests.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..57a65e1 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1261,9 +1261,9 @@ Unit tests for data structure packing %header -basetsd.h winnt.h windef.h +guiddef.h urlmon.h %include -- 2.10.0.windows.1

2 4

[PATCH] ntdll: interpretation of l_addr depends on FreeBSD version
by Damjan Jovanovic 10 Jun '20

10 Jun '20

FreeBSD changed l_addr to mean the relocation offset like it does on other OSes, and provided a dynamic linker symbol, "_rtld_version_laddr_offset", that can be used to check the meaning. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

2 1

[PATCH] advapi32: Add RegEnableReflectionKey stub
by Alex Henrie 10 Jun '20

10 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49358 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ac8ea6268a..64b0288dc9 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -639,7 +639,7 @@ @ stdcall RegDisablePredefinedCache() # @ stub RegDisablePredefinedCacheEx @ stdcall RegDisableReflectionKey(ptr) -# @ stub RegEnableReflectionKey +@ stdcall RegEnableReflectionKey(ptr) @ stdcall RegEnumKeyA(long long ptr long) @ stdcall -import RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) @ stdcall -import RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index b8b168496f..7cfdbaa53b 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -635,6 +635,17 @@ LONG WINAPI RegCopyTreeA( HKEY hsrc, const char *subkey, HKEY hdst ) } +/****************************************************************************** + * RegEnableReflectionKey [ADVAPI32.@] + * + */ +LONG WINAPI RegEnableReflectionKey(HKEY base) +{ + FIXME("%p: stub\n", base); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + /****************************************************************************** * RegDisableReflectionKey [ADVAPI32.@] * -- 2.27.0

1 0

[PATCH v2 3/4] windowscodecs/tests: Add more tests for DdsFrameDecode_Dds_CopyBlocks() when "boundsInBlocks" is NULL.
by Ziqing Hui 10 Jun '20

10 Jun '20

The added tests shows that when boundsInBlocks parameter is NULL, stride parameter will be checked to ensure it is bigger or equal to frame stride, but it will be ignored in the call. This can be proved by: * CopyBlocks(NULL, frame_stride - 1, sizeof(buffer), buffer) return error. * CopyBlocks(NULL, frame_stride, sizeof(buffer), buffer) and CopyBlocks(NULL, frame_stride * 2, sizeof(buffer), buffer) works fine and result in same buffer content. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 37 ++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 7 deletions(-)

4 4

[PATCH v2 4/4] windowscodecs: Implement DdsFrameDecode_Dds_CopyBlocks().
by Ziqing Hui 10 Jun '20

10 Jun '20

v2: Add a check for stride size when boundsInBlocks is NULL. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 42 ++++++++++++++++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 42 ++++++++++++++-------------- 2 files changed, 61 insertions(+), 23 deletions(-)

2 1