- Wine-Devel - list.winehq.org

[PATCH v2 1/4] prntvpt: Implement PTOpenProviderEx.
by Dmitry Timoshkov June 10, 2020

June 10, 2020

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 June 10, 2020

June 10, 2020

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 June 10, 2020

June 10, 2020

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 June 10, 2020

June 10, 2020

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 June 10, 2020

June 10, 2020

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 June 10, 2020

June 10, 2020

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

[PATCH v2 2/4] windowscodecs/tests: Add a DXT3 test image for DDS decoder.
by Ziqing Hui June 10, 2020

June 10, 2020

We only tested DXT1 images with 1 blocks before. That's not enough. Also, for CopyBlocks(), when boundsInBlocks parameter is NULL, the stride should be the stride of the frame itself. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 67 ++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 8 deletions(-)

2 1

[PATCH v2 1/4] windowscodecs: Initialize block data in DdsDecoder_Dds_GetFrame().
by Ziqing Hui June 10, 2020

June 10, 2020

v2: * Correct the HeapFree() order. * Simplify the loop in GetFrame(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 68 +++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 14 deletions(-)

2 1

[PATCH] include: Add IMarkupServices2, IMarkupContainer2 and IMarkupPointer2 related interfaces
by Vijay Kiran Kamuju June 9, 2020

June 9, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH] 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 | 13 ++++++++++++- dlls/ntdll/tests/file.c | 21 +++++++++++++++++++++ server/file.c | 14 +------------- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1b70e473676..57baa102af4 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3584,7 +3584,18 @@ 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 (type == FD_TYPE_FILE || type == FD_TYPE_DIR) + { + if (!ret) + { + 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..6502bc3e08c 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 %#x.\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 %#x.\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 %#x.\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

2 1