wine-devel September 2018

wine-devel@winehq.org

70 participants
627 discussions

[PATCH 4/4] mshtml: Add IHTMLCSSStyleDeclaration2 stub implementation.
by Jacek Caban 06 Sep '18

06 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 1897 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/style.c | 9 + 4 files changed, 1908 insertions(+)

1 0

[PATCH 3/4] mshtml: Added IHTMLCSSStyleDeclaration::zoom property implementation.
by Jacek Caban 06 Sep '18

06 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/tests/style.c | 25 +++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-)

1 0

[PATCH 2/4] mshtml: Added IHTMLCSSStyleDeclaration::opacity property implementation.
by Jacek Caban 06 Sep '18

06 Sep '18

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

1 0

[PATCH 1/4] mshtml: Added IHTMLCSSStyleDeclaration::backgroundClip property implementation.
by Jacek Caban 06 Sep '18

06 Sep '18

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

1 0

[PATCH] fltmgr.sys: Add stubs for FltAcquirePushLockExclusive, FltDeletePushLock and FltReleasePushLock.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/fltmgr.sys/fltmgr.sys.spec | 6 +++--- dlls/fltmgr.sys/main.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index 7b1ba2983c..39ce679817 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -1,4 +1,4 @@ -@ stub FltAcquirePushLockExclusive +@ stdcall FltAcquirePushLockExclusive(ptr) @ stub FltAcquirePushLockShared @ stub FltAcquireResourceExclusive @ stub FltAcquireResourceShared @@ -40,7 +40,7 @@ @ stub FltDeleteContext @ stub FltDeleteFileContext @ stub FltDeleteInstanceContext -@ stub FltDeletePushLock +@ stdcall FltDeletePushLock(ptr) @ stub FltDeleteStreamContext @ stub FltDeleteStreamHandleContext @ stub FltDeleteVolumeContext @@ -133,7 +133,7 @@ @ stub FltReleaseContext @ stub FltReleaseContexts @ stub FltReleaseFileNameInformation -@ stub FltReleasePushLock +@ stdcall FltReleasePushLock(ptr) @ stub FltReleaseResource @ stub FltRequestOperationStatusCallback @ stub FltRetainSwappedBufferMdlAddress diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 16ca2845c2..a1b81e5a89 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -43,6 +43,21 @@ void WINAPI FltInitializePushLock( EX_PUSH_LOCK *lock ) FIXME( "(%p): stub\n", lock ); } +void WINAPI FltDeletePushLock( EX_PUSH_LOCK *lock ) +{ + FIXME( "(%p): stub\n", lock ); +} + +void WINAPI FltAcquirePushLockExclusive( EX_PUSH_LOCK *lock ) +{ + FIXME( "(%p): stub\n", lock ); +} + +void WINAPI FltReleasePushLock( EX_PUSH_LOCK *lock ) +{ + FIXME( "(%p): stub\n", lock ); +} + NTSTATUS WINAPI FltRegisterFilter( PDRIVER_OBJECT driver, const FLT_REGISTRATION *reg, PFLT_FILTER *filter ) { FIXME( "(%p,%p,%p): stub\n", driver, reg, filter ); -- 2.17.1

2 2

[PATCH] pidgen.dll: add stub for PIDGenSimpW
by Louis Lenders 06 Sep '18

06 Sep '18

For https://bugs.winehq.org/show_bug.cgi?id=45770 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/pidgen/main.c | 7 +++++++ dlls/pidgen/pidgen.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index cf165eae13..95f5389cc0 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -50,3 +50,10 @@ int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p return 0; } + +int WINAPI PIDGenSimpW(const WCHAR* str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_w(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec index 8b7e778b91..aba010715f 100644 --- a/dlls/pidgen/pidgen.spec +++ b/dlls/pidgen/pidgen.spec @@ -1,7 +1,7 @@ @ stub PIDGenA @ stub PIDGenW @ stdcall PIDGenSimpA(str long long long long long long long long) -@ stub PIDGenSimpW +@ stdcall PIDGenSimpW(wstr long long long long long long long long) @ stub SetupPIDGenA @ stub SetupPIDGenW @ stub VerifyPIDSequenceW -- 2.17.1

1 0

[PATCH] ntoskrnl: Add a test for a failing to load driver.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 ++++ dlls/ntoskrnl.exe/tests/driver3.c | 31 ++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver3.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 22 ++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 dlls/ntoskrnl.exe/tests/driver3.c create mode 100644 dlls/ntoskrnl.exe/tests/driver3.spec diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index fae11bb703..7946b8de22 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -5,10 +5,14 @@ driver_IMPORTS = winecrt0 ntoskrnl driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver2_IMPORTS = winecrt0 ntoskrnl driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver3_IMPORTS = winecrt0 ntoskrnl +driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ driver.c \ driver.spec \ driver2.c \ driver2.spec \ + driver3.c \ + driver3.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver3.c b/dlls/ntoskrnl.exe/tests/driver3.c new file mode 100644 index 0000000000..a7737a960a --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver3.c @@ -0,0 +1,31 @@ +/* + * Copyright 2018 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 + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "ddk/wdm.h" + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *obj, UNICODE_STRING *path) +{ + DbgPrint("driver3: DriverEntry\n"); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/tests/driver3.spec b/dlls/ntoskrnl.exe/tests/driver3.spec new file mode 100644 index 0000000000..ad33444716 --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver3.spec @@ -0,0 +1 @@ +# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 73f0e85a51..fe070d4e8b 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -219,6 +219,26 @@ static void test_load_driver(SC_HANDLE service) ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); } +static void test_driver3(void) +{ + char filename[MAX_PATH]; + SC_HANDLE service; + BOOL ret; + + service = load_driver(filename, "driver3.dll", "WineTestDriver3"); + ok(service != NULL, "driver3 failed to load\n"); + + ret = StartServiceA(service, 0, NULL); + ok(!ret, "driver3 should fail to start\n"); +todo_wine + ok(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED || GetLastError() == ERROR_PROC_NOT_FOUND /* XP */ || + GetLastError() == ERROR_FILE_NOT_FOUND /* Win7 */, "got %u\n", GetLastError()); + + DeleteService(service); + CloseServiceHandle(service); + DeleteFileA(filename); +} + START_TEST(ntoskrnl) { char filename[MAX_PATH], filename2[MAX_PATH]; @@ -247,4 +267,6 @@ START_TEST(ntoskrnl) unload_driver(service); ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); ok(DeleteFileA(filename2), "DeleteFile failed: %u\n", GetLastError()); + + test_driver3(); } -- 2.17.1

2 2

[PATCH v4] kernel32: Correct ReplaceFileW behaviour
by Brock York 06 Sep '18

06 Sep '18

ReplaceFileW should fail with ERROR_ACCESS_DENIED when either the replaced or replacement file is set to read only using SetFileAttributes. Testing for the return values of ReplaceFileW was performed on a Windows XP SP3 and Windows 10 vm. Remove GENERIC_WRITE flag when opening replaced file. ReplaceFileW will fail when called to replace the current executable. This is not the same behaviour as tested on Windows 7, 10 and XP this is because the "replaced" file is opened with the GENERIC_WRITE flag. The MSDN also mentions that the replaced file is only opened with GENERIC_READ, DELETE and SYNCHRONIZE. This patch will fix the following bug once it is merged into Wine-Staging as the WarFrame launcher requires patches from Wine-Staging to work. Wine-Bug:https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Brock York <twunknown(a)gmail.com> --- dlls/kernel32/file.c | 29 ++++++++++++++++++++++++++++- dlls/kernel32/tests/file.c | 4 ++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 081f0760a5..bc916f26c3 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1738,6 +1738,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa NTSTATUS status; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; + BY_HANDLE_FILE_INFORMATION file_info; TRACE("%s %s %s 0x%08x %p %p\n", debugstr_w(lpReplacedFileName), debugstr_w(lpReplacementFileName), debugstr_w(lpBackupFileName), @@ -1772,7 +1773,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa } replaced_flags = lpBackupFileName ? FILE_OPEN : FILE_OPEN_IF; attr.ObjectName = &nt_replaced_name; - status = NtOpenFile(&hReplaced, GENERIC_READ|GENERIC_WRITE|DELETE|SYNCHRONIZE, + status = NtOpenFile(&hReplaced, GENERIC_READ|DELETE|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); @@ -1788,6 +1789,19 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replaced is READ_ONLY */ + if (!GetFileInformationByHandle(hReplaced, &file_info)) + { + error = GetLastError(); + goto fail; + } + + if (file_info->dwFileAttributes & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* * Open the replacement file for reading, writing, and deleting * (writing and deleting are needed when finished) @@ -1811,6 +1825,19 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replacement is READ_ONLY */ + if (!GetFileInformationByHandle(hReplacement, &file_info)) + { + error = GetLastError(); + goto fail; + } + + if (file_info->dwFileAttributes & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* If the user wants a backup then that needs to be performed first */ if (lpBackupFileName) { diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33cae4b7c4..8e4a994142 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3666,7 +3666,7 @@ static void test_ReplaceFileA(void) */ SetLastError(0xdeadbeef); ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); - todo_wine ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* make sure that the replacement file still exists */ hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hReplacementFile != INVALID_HANDLE_VALUE || @@ -3698,7 +3698,7 @@ static void test_ReplaceFileA(void) "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); /*Calling ReplaceFileA on an exe should succeed*/ ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); - todo_wine ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); CloseHandle(hReplacedFile); /* replacement file still exists, make pass w/o "replaced" */ -- 2.18.0

2 1

[PATCH] ntoskrnl.exe: Fix cross-compilation of the driver tests.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- dlls/ntoskrnl.exe/tests/driver.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index d424396d4c..68b6730c9b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -75,8 +75,8 @@ static void WINAPIV ok_(const char *file, int line, int condition, const char *m const char *current_file; __ms_va_list args; - if (!(current_file = strrchr(file, '/')) && - !(current_file = strrchr(file, '\\'))) + if (!(current_file = drv_strrchr(file, '/')) && + !(current_file = drv_strrchr(file, '\\'))) current_file = file; else current_file++; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 6a4179ed00..be4a9dc837 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -35,3 +35,10 @@ struct test_input int winetest_debug; WCHAR path[1]; }; + +static inline char *drv_strrchr( const char *str, char ch ) +{ + char *ret = NULL; + do { if (*str == ch) ret = (char *)(ULONG_PTR)str; } while (*str++); + return ret; +} -- 2.17.1

1 0

[PATCH] ntoskrnl.exe: Add a stub for MmCreateSection.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 577f5b3ba4..292f89c2e7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2357,6 +2357,18 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS return NULL; } +/*********************************************************************** + * MmCreateSection (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI MmCreateSection( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + LARGE_INTEGER *size, ULONG protect, ULONG alloc_attr, + HANDLE file, FILE_OBJECT *file_obj ) +{ + FIXME("%p %#x %p %s %#x %#x %p %p: stub\n", handle, access, attr, + wine_dbgstr_longlong(size->QuadPart), protect, alloc_attr, file, file_obj); + return STATUS_NOT_IMPLEMENTED; +} + /*********************************************************************** * MmFreeNonCachedMemory (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8079114966..e867dbe680 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -669,7 +669,7 @@ @ stub MmCanFileBeTruncated @ stub MmCommitSessionMappedView @ stub MmCreateMdl -@ stub MmCreateSection +@ stdcall MmCreateSection(ptr long ptr ptr long long long ptr) @ stub MmDisableModifiedWriteOfSection @ stub MmFlushImageSection @ stub MmForceSectionClosed -- 2.17.1

1 0

← Newer
1
...
55
56
57
58
59
60
61
62
63
Older →

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 September 2018