September 2018 - Wine-commits

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2 stub implementation.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: f072744bc544a4dd64850c74b92cfda9384755bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f072744bc544a4dd64850c74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 16:15:35 2018 +0200 mshtml: Add IHTMLCSSStyleDeclaration2 stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f072744bc544a4dd6485…

1 0

Dmitry Timoshkov : fltmgr.sys: Add stubs for FltAcquirePushLockExclusive, FltDeletePushLock and FltReleasePushLock.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: f141ed7a8140288a0172e48d5d37a47b146f2fc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f141ed7a8140288a0172e48d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 6 17:01:16 2018 +0800 fltmgr.sys: Add stubs for FltAcquirePushLockExclusive, FltDeletePushLock and FltReleasePushLock. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 7b1ba29..39ce679 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 16ca284..a1b81e5 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 );

1 0

Dmitry Timoshkov : ntoskrnl: Fix cross-compilation of the driver tests.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 8a20d6e83d55f9b9d77567d4f97e54cb5ddd5a52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a20d6e83d55f9b9d77567d4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 6 17:01:24 2018 +0800 ntoskrnl: Fix cross-compilation of the driver tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 d424396..68b6730 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 6a4179e..be4a9dc 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; +}

1 0

Dmitry Timoshkov : ntoskrnl: Add a test for a failing to load driver.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: ffbb44b01f50521532e7d67d0c61c43f9ccf3d7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffbb44b01f50521532e7d67d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 6 17:01:28 2018 +0800 ntoskrnl: Add a test for a failing to load driver. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(+) diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index fae11bb..7946b8d 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 0000000..a7737a9 --- /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 0000000..ad33444 --- /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 73f0e85..fe070d4 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(); }

1 0

Josh DuBois : ntdll: Use root of c: drive as fallback cwd during startup.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 7f567451b29b1c1d3e16f147136e00f545d640b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f567451b29b1c1d3e16f147… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Thu Sep 6 12:21:48 2018 -0500 ntdll: Use root of c: drive as fallback cwd during startup. Signed-off-by: Josh DuBois <duboisj(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index c1f231e..ec03445 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1124,9 +1124,10 @@ static void start_server(void) * * Setup the wine configuration dir. */ -static void setup_config_dir(void) +static int setup_config_dir(void) { const char *p, *config_dir = wine_get_config_dir(); + int fd_cwd = open( ".", O_RDONLY ); if (chdir( config_dir ) == -1) { @@ -1154,7 +1155,7 @@ static void setup_config_dir(void) if (mkdir( "dosdevices", 0777 ) == -1) { - if (errno == EEXIST) return; + if (errno == EEXIST) goto done; fatal_perror( "cannot create %s/dosdevices\n", config_dir ); } @@ -1163,6 +1164,11 @@ static void setup_config_dir(void) mkdir( "drive_c", 0777 ); symlink( "../drive_c", "dosdevices/c:" ); symlink( "/", "dosdevices/z:" ); + +done: + if (fd_cwd == -1) fd_cwd = open( "dosdevices/c:", O_RDONLY ); + fcntl( fd_cwd, F_SETFD, FD_CLOEXEC ); + return fd_cwd; } @@ -1212,11 +1218,7 @@ static int server_connect(void) struct stat st; int s, slen, retry, fd_cwd; - /* retrieve the current directory */ - fd_cwd = open( ".", O_RDONLY ); - if (fd_cwd != -1) fcntl( fd_cwd, F_SETFD, FD_CLOEXEC ); - - setup_config_dir(); + fd_cwd = setup_config_dir(); serverdir = wine_get_server_dir(); /* chdir to the server directory */

1 0

Gijs Vermeulen : msvcp110: Export xtime_get.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 31b671f341786f8f7fb4639819b87dfedba30cdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=31b671f341786f8f7fb46398… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Sep 6 20:41:52 2018 +0200 msvcp110: Export xtime_get. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45784 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0837526..7bd35fa 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3899,4 +3899,4 @@ @ cdecl towctrans(long long) @ cdecl wctrans(str) @ cdecl wctype(str) -@ stub xtime_get +@ cdecl xtime_get(ptr long)

1 0

Gijs Vermeulen : msvcp110: Export _Xtime_diff_to_millis2.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: c5bb1084844ce94a841e218dc0b64e7d8ed13f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5bb1084844ce94a841e218d… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Sep 6 20:41:53 2018 +0200 msvcp110: Export _Xtime_diff_to_millis2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45785 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 7bd35fa..8be2e17 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3892,7 +3892,7 @@ @ stub _Xp_sqrtx @ stub _Xp_subx @ stub _Xtime_diff_to_millis -@ stub _Xtime_diff_to_millis2 +@ cdecl _Xtime_diff_to_millis2(ptr ptr) @ cdecl _Xtime_get_ticks() @ stub __Wcrtomb_lk # extern _Zero

1 0

Nikolay Sivov : opcservices: Implement GetSourceUri().
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 951741e649dad4728cf95383022a0c01df528c8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=951741e649dad4728cf95383… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:11 2018 +0300 opcservices: Implement GetSourceUri(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 2 +- dlls/opcservices/opc_private.h | 2 +- dlls/opcservices/package.c | 40 ++++++++++++++++++++++++++------ dlls/opcservices/tests/opcservices.c | 45 ++++++++++++++++++++++++++++++++---- 4 files changed, 76 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=951741e649dad4728cf9…

1 0

Nikolay Sivov : opcservices: Implement writing stub compressed package.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 80579d63444a7a10d68a5e0c9660862d7c456f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80579d63444a7a10d68a5e0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:12 2018 +0300 opcservices: Implement writing stub compressed package. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 4 +- dlls/opcservices/compress.c | 366 +++++++++++++++++++++++++++++++++++++++++ dlls/opcservices/factory.c | 5 +- dlls/opcservices/opc_private.h | 8 + dlls/opcservices/package.c | 55 +++++++ 5 files changed, 435 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=80579d63444a7a10d68a…

1 0

Nikolay Sivov : opcservices: Implement GetCompressionOptions().
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: c2d8323f2318903848e67a63e36a33560ac0770f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2d8323f2318903848e67a63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:13 2018 +0300 opcservices: Implement GetCompressionOptions(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 20d7b4e..00f4a4f 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -221,9 +221,12 @@ static HRESULT WINAPI opc_part_GetContentType(IOpcPart *iface, LPWSTR *type) static HRESULT WINAPI opc_part_GetCompressionOptions(IOpcPart *iface, OPC_COMPRESSION_OPTIONS *options) { - FIXME("iface %p, options %p stub!\n", iface, options); + struct opc_part *part = impl_from_IOpcPart(iface); - return E_NOTIMPL; + TRACE("iface %p, options %p.\n", iface, options); + + *options = part->compression_options; + return S_OK; } static const IOpcPartVtbl opc_part_vtbl =

1 0