- Wine-Devel - list.winehq.org

[PATCH 4/4] prntvpt: Add some tests for PTOpenProvider and PTOpenProviderEx.
by Dmitry Timoshkov June 9, 2020

June 9, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/prntvpt/tests/Makefile.in | 5 ++ dlls/prntvpt/tests/prntvpt.c | 142 +++++++++++++++++++++++++++++++++ include/prntvpt.h | 1 + 4 files changed, 149 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..47f9f8341b --- /dev/null +++ b/dlls/prntvpt/tests/prntvpt.c @@ -0,0 +1,142 @@ +/* + * 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) return; + + 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) return; + + 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; + + CoInitialize(NULL); + + 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(); +} 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

2 1

[PATCH v2] ntdll: Perform fsync() in client for files and directories.
by Paul Gofman June 9, 2020

June 9, 2020

Fixes stuttering in Assetto Corsa Competizione (multiplayer mode). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/file.c | 10 +++++++++- dlls/ntdll/tests/file.c | 21 +++++++++++++++++++++ server/file.c | 14 +------------- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1b70e473676..aba7b608f69 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3584,7 +3584,15 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) if (ret == STATUS_ACCESS_DENIED) ret = unix_funcs->server_get_unix_fd( hFile, FILE_APPEND_DATA, &fd, &needs_close, &type, NULL ); - if (!ret && type == FD_TYPE_SERIAL) + if (!ret && (type == FD_TYPE_FILE || type == FD_TYPE_DIR)) + { + if (fsync(fd)) + ret = FILE_GetNtStatus(); + + io->u.Status = ret; + io->Information = 0; + } + else if (!ret && type == FD_TYPE_SERIAL) { ret = COMM_FlushBuffersFile( fd ); } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 31c18454f0e..44c2929fd2d 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4863,14 +4863,26 @@ static void test_flush_buffers_file(void) status = pNtFlushBuffersFile(hfile, (IO_STATUS_BLOCK *)0xdeadbeaf); ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + io_status_block.Information = 0xdeadbeef; + io_status_block.Status = 0xdeadbeef; status = pNtFlushBuffersFile(hfile, &io_status_block); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + ok(io_status_block.Status == STATUS_SUCCESS, "Got unexpected io_status_block.Status %#x.\n", + io_status_block.Status); + ok(!io_status_block.Information, "Got unexpected io_status_block.Information %#lx.\n", + io_status_block.Information); status = pNtFlushBuffersFile(hfileread, &io_status_block); ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status); + io_status_block.Information = 0xdeadbeef; + io_status_block.Status = 0xdeadbeef; status = pNtFlushBuffersFile(NULL, &io_status_block); ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x.\n", status); + ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#x.\n", + io_status_block.Status); + ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#lx.\n", + io_status_block.Information); CloseHandle(hfileread); CloseHandle(hfile); @@ -4881,6 +4893,15 @@ static void test_flush_buffers_file(void) status = pNtFlushBuffersFile(hfile, &io_status_block); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + io_status_block.Information = 0xdeadbeef; + io_status_block.Status = 0xdeadbeef; + status = pNtFlushBuffersFile((HANDLE)0xdeadbeef, &io_status_block); + ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x.\n", status); + ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#x.\n", + io_status_block.Status); + ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#lx.\n", + io_status_block.Information); + CloseHandle(hfile); DeleteFileA(buffer); } diff --git a/server/file.c b/server/file.c index bce202138e0..38260cfd2b3 100644 --- a/server/file.c +++ b/server/file.c @@ -75,7 +75,6 @@ static struct list *file_get_kernel_obj_list( struct object *obj ); static void file_destroy( struct object *obj ); static int file_get_poll_events( struct fd *fd ); -static int file_flush( struct fd *fd, struct async *async ); static enum server_fd_type file_get_fd_type( struct fd *fd ); static const struct object_ops file_ops = @@ -108,7 +107,7 @@ static const struct fd_ops file_fd_ops = file_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ no_fd_write, /* write */ - file_flush, /* flush */ + no_fd_flush, /* flush */ default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ @@ -296,17 +295,6 @@ static int file_get_poll_events( struct fd *fd ) return events; } -static int file_flush( struct fd *fd, struct async *async ) -{ - int unix_fd = get_unix_fd( fd ); - if (unix_fd != -1 && fsync( unix_fd ) == -1) - { - file_set_error(); - return 0; - } - return 1; -} - static enum server_fd_type file_get_fd_type( struct fd *fd ) { struct file *file = get_fd_user( fd ); -- 2.26.2

1 0

[PATCH] ntoskrnl: Use loader notification callback to perform relocations.
by Jacek Caban June 9, 2020

June 9, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49093 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The main problem with current code is that it causes infinite recursion if there is circular dependency in modules that need relocations. The other problem is that if a module does not need relocations, its dependences are not checked. dlls/ntoskrnl.exe/ntoskrnl.c | 182 ++++++++++++++--------------------- include/winternl.h | 2 + 2 files changed, 72 insertions(+), 112 deletions(-)

1 0

[PATCH 3/4] prntvpt: Implement PTCloseProvider.
by Dmitry Timoshkov June 9, 2020

June 9, 2020

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_INVALIDARG; + + 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 2/4] prntvpt: Implement PTOpenProvider.
by Dmitry Timoshkov June 9, 2020

June 9, 2020

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 1/4] prntvpt: Implement PTOpenProviderEx.
by Dmitry Timoshkov June 9, 2020

June 9, 2020

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 12/12] mshtml: Use proper compat mode in IHTMLWindow7::getComputedStyle.
by Jacek Caban June 9, 2020

June 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/htmlwindow.c | 4 ++-- dlls/mshtml/tests/documentmode.js | 1 + 4 files changed, 6 insertions(+), 5 deletions(-)

1 0

[PATCH 11/12] mshtml: Expose IHTMLCSSStyleDeclaration2 to scripts.
by Jacek Caban June 9, 2020

June 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 62 +++++++++++++++++++++---------- dlls/mshtml/tests/documentmode.js | 3 ++ 2 files changed, 46 insertions(+), 19 deletions(-)

1 0

[PATCH 10/12] mshtml: Add IHTMLCSSStyleDeclaration2::columnRule property semi-stub implementation.
by Jacek Caban June 9, 2020

June 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-)

1 0

[PATCH 09/12] mshtml: Add IHTMLCSSStyleDeclaration2::columnRuleWidth property semi-stub implementation.
by Jacek Caban June 9, 2020

June 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-)

1 0