September 2018 - Wine-Commits

Dmitry Timoshkov : ntoskrnl: Add a test for a failing to load driver.
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

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

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: zoom property implementation.
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: 619e15a3e6553f8093db07c4152343e9acec5fd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=619e15a3e6553f8093db07c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 16:15:19 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::zoom property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/tests/style.c | 25 +++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a467d2e..2bc7f9e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -6225,15 +6225,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_layoutFlow(IHTMLCSSStyleDeclar static HRESULT WINAPI HTMLCSSStyleDeclaration_put_zoom(IHTMLCSSStyleDeclaration *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return IHTMLStyle3_put_zoom(&This->IHTMLStyle3_iface, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_zoom(IHTMLCSSStyleDeclaration *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return IHTMLStyle3_get_zoom(&This->IHTMLStyle3_iface, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_wordWrap(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 72f3690..8594363 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -488,7 +488,7 @@ static void test_style2(IHTMLStyle2 *style2) SysFreeString(str); } -static void test_style3(IHTMLStyle3 *style3) +static void test_style3(IHTMLStyle3 *style3, IHTMLCSSStyleDeclaration *css_style) { VARIANT v; BSTR str; @@ -521,6 +521,7 @@ static void test_style3(IHTMLStyle3 *style3) V_BSTR(&v) = a2bstr("100%"); hres = IHTMLStyle3_put_zoom(style3, v); ok(hres == S_OK, "put_zoom failed: %08x\n", hres); + VariantClear(&v); V_VT(&v) = VT_ERROR; hres = IHTMLStyle3_get_zoom(style3, &v); @@ -529,6 +530,13 @@ static void test_style3(IHTMLStyle3 *style3) ok(!strcmp_wa(V_BSTR(&v), "100%"), "V_BSTR(zoom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + if(css_style) { + hres = IHTMLCSSStyleDeclaration_get_zoom(css_style, &v); + ok(hres == S_OK, "get_zoom failed: %08x\n", hres); + test_var_bstr(&v, "100%"); + VariantClear(&v); + } + V_VT(&v) = VT_I4; V_I4(&v) = 1; hres = IHTMLStyle3_put_zoom(style3, v); @@ -540,6 +548,19 @@ static void test_style3(IHTMLStyle3 *style3) ok(V_VT(&v) == VT_BSTR, "V_VT(zoom) = %d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "1"), "V_BSTR(zoom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + + if(css_style) { + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("100%"); + hres = IHTMLCSSStyleDeclaration_put_zoom(css_style, v); + ok(hres == S_OK, "put_zoom failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLCSSStyleDeclaration_get_zoom(css_style, &v); + ok(hres == S_OK, "get_zoom failed: %08x\n", hres); + test_var_bstr(&v, "100%"); + VariantClear(&v); + } } static void test_style4(IHTMLStyle4 *style4) @@ -2844,7 +2865,7 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle3, (void**)&style3); ok(hres == S_OK, "Could not get IHTMLStyle3 iface: %08x\n", hres); if(SUCCEEDED(hres)) { - test_style3(style3); + test_style3(style3, css_style); IHTMLStyle3_Release(style3); }

1 0

Dmitry Timoshkov : fltmgr.sys: Add stubs for FltAcquirePushLockExclusive, FltDeletePushLock and FltReleasePushLock.
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

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

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: opacity property implementation.
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: 042fbbc5f36f55a8bda79c53b141df40521a1e04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=042fbbc5f36f55a8bda79c53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 16:15:11 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::opacity property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 11 +++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 6f59250..a467d2e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -156,6 +156,8 @@ static const WCHAR min_heightW[] = {'m','i','n','-','h','e','i','g','h','t',0}; static const WCHAR min_widthW[] = {'m','i','n','-','w','i','d','t','h',0}; +static const WCHAR opacityW[] = + {'o','p','a','c','i','t','y',0}; static const WCHAR outlineW[] = {'o','u','t','l','i','n','e',0}; static const WCHAR overflowW[] = @@ -393,6 +395,7 @@ static const style_tbl_entry_t style_tbl[] = { {max_widthW, DISPID_IHTMLSTYLE5_MAXWIDTH, ATTR_FIX_PX}, {min_heightW, DISPID_IHTMLSTYLE4_MINHEIGHT}, {min_widthW, DISPID_IHTMLSTYLE5_MINWIDTH, ATTR_FIX_PX}, + {opacityW, DISPID_UNKNOWN}, {outlineW, DISPID_IHTMLSTYLE6_OUTLINE, ATTR_NO_NULL}, {overflowW, DISPID_IHTMLSTYLE_OVERFLOW, 0, overflow_values}, {overflow_xW, DISPID_IHTMLSTYLE2_OVERFLOWX}, @@ -6796,15 +6799,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_fontStretch(IHTMLCSSStyleDecla static HRESULT WINAPI HTMLCSSStyleDeclaration_put_opacity(IHTMLCSSStyleDeclaration *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return set_style_property_var(This, STYLEID_OPACITY, &v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_opacity(IHTMLCSSStyleDeclaration *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property_var(This, STYLEID_OPACITY, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_clipPath(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 1a83d4f..2e5cb27 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -94,6 +94,7 @@ typedef enum { STYLEID_MAX_WIDTH, STYLEID_MIN_HEIGHT, STYLEID_MIN_WIDTH, + STYLEID_OPACITY, STYLEID_OUTLINE, STYLEID_OVERFLOW, STYLEID_OVERFLOW_X, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 309ca40..72f3690 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -738,6 +738,7 @@ static void test_style6(IHTMLStyle6 *style) static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) { + VARIANT v; BSTR str; HRESULT hres; @@ -754,6 +755,31 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) ok(hres == S_OK, "get_backgroundClip failed: %08x\n", hres); ok(!strcmp_wa(str, "border-box"), "backgroundClip = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); + ok(hres == S_OK, "get_opacity failed: %08x\n", hres); + test_var_bstr(&v, NULL); + + V_VT(&v) = VT_I4; + V_I4(&v) = 0; + hres = IHTMLCSSStyleDeclaration_put_opacity(css_style, v); + ok(hres == S_OK, "put_opacity failed: %08x\n", hres); + + hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); + ok(hres == S_OK, "get_opacity failed: %08x\n", hres); + test_var_bstr(&v, "0"); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("1"); + hres = IHTMLCSSStyleDeclaration_put_opacity(css_style, v); + ok(hres == S_OK, "put_opacity failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); + ok(hres == S_OK, "get_opacity failed: %08x\n", hres); + test_var_bstr(&v, "1"); + VariantClear(&v); } static void test_body_style(IHTMLStyle *style) @@ -1790,6 +1816,14 @@ static void test_body_style(IHTMLStyle *style) ok(hres == S_OK, "put_filter failed: %08x\n", hres); SysFreeString(str); + hres = IHTMLStyle_put_filter(style, NULL); + ok(hres == S_OK, "put_filter failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_filter(style, &str); + ok(hres == S_OK, "get_filter failed: %08x\n", hres); + ok(!str, "filter != NULL\n"); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_zIndex(style, &v); ok(hres == S_OK, "get_zIndex failed: %08x\n", hres);

1 0

Josh DuBois : ntdll: Use root of c: drive as fallback cwd during startup.
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

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 Sept. 6, 2018

Sept. 6, 2018

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 Sept. 6, 2018

Sept. 6, 2018

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

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: backgroundClip property implementation.
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: 6ebfbcc6872c4099f75d210b661ef5f653b47d15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebfbcc6872c4099f75d210b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 16:15:04 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::backgroundClip property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 13 ++++++++----- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 23 +++++++++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2454d86..6f59250 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -39,6 +39,8 @@ static const WCHAR backgroundW[] = {'b','a','c','k','g','r','o','u','n','d',0}; static const WCHAR background_attachmentW[] = {'b','a','c','k','g','r','o','u','n','d','-','a','t','t','a','c','h','m','e','n','t',0}; +static const WCHAR background_clipW[] = + {'b','a','c','k','g','r','o','u','n','d','-','c','l','i','p',0}; static const WCHAR background_colorW[] = {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; static const WCHAR background_imageW[] = @@ -333,6 +335,7 @@ typedef struct { static const style_tbl_entry_t style_tbl[] = { {backgroundW, DISPID_IHTMLSTYLE_BACKGROUND}, {background_attachmentW, DISPID_IHTMLSTYLE_BACKGROUNDATTACHMENT}, + {background_clipW, DISPID_UNKNOWN}, {background_colorW, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR, ATTR_HEX_INT}, {background_imageW, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE, ATTR_FIX_URL}, {background_positionW, DISPID_IHTMLSTYLE_BACKGROUNDPOSITION}, @@ -7290,15 +7293,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_cssFloat(IHTMLCSSStyleDeclarat static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundClip(IHTMLCSSStyleDeclaration *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_BACKGROUND_CLIP, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_backgroundClip(IHTMLCSSStyleDeclaration *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_BACKGROUND_CLIP, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundOrigin(IHTMLCSSStyleDeclaration *iface, BSTR v) @@ -7760,7 +7763,7 @@ static HRESULT HTMLStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, const style_tbl_entry_t *style_entry; style_entry = lookup_style_tbl(name); - if(style_entry) { + if(style_entry && style_entry->dispid != DISPID_UNKNOWN) { *dispid = style_entry->dispid; return S_OK; } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 9fb96f2..1a83d4f 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -36,6 +36,7 @@ struct HTMLStyle { typedef enum { STYLEID_BACKGROUND, STYLEID_BACKGROUND_ATTACHMENT, + STYLEID_BACKGROUND_CLIP, STYLEID_BACKGROUND_COLOR, STYLEID_BACKGROUND_IMAGE, STYLEID_BACKGROUND_POSITION, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 8c6ad20..309ca40 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -736,6 +736,26 @@ static void test_style6(IHTMLStyle6 *style) SysFreeString(str); } +static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLCSSStyleDeclaration_get_backgroundClip(css_style, &str); + ok(hres == S_OK, "get_backgroundClip failed: %08x\n", hres); + ok(!str, "backgroundClip = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("border-box"); + hres = IHTMLCSSStyleDeclaration_put_backgroundClip(css_style, str); + ok(hres == S_OK, "put_backgroundClip failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLCSSStyleDeclaration_get_backgroundClip(css_style, &str); + ok(hres == S_OK, "get_backgroundClip failed: %08x\n", hres); + ok(!strcmp_wa(str, "border-box"), "backgroundClip = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + static void test_body_style(IHTMLStyle *style) { IHTMLCSSStyleDeclaration *css_style; @@ -2817,6 +2837,9 @@ static void test_body_style(IHTMLStyle *style) win_skip("IHTMLStyle6 not available\n"); } + if(compat_mode >= COMPAT_IE9) + test_css_style_declaration(css_style); + if(css_style) IHTMLCSSStyleDeclaration_Release(css_style); }

1 0

Louis Lenders : pidgen: Add stub for PIDGenSimpW.
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: db2d831600f9677f81023d639d30f21fcfa29eb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db2d831600f9677f81023d63… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Sep 6 13:23:29 2018 +0200 pidgen: Add stub for PIDGenSimpW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45770 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 cf165ea..95f5389 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 8b7e778..aba0107 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

1 0

Alexandre Julliard : shell32: Re-add support for expanding ALLUSERSPROFILE for backward compatibility.
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: 4a6855a575c02aa1569aab8b2e96720fc02f3f26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a6855a575c02aa1569aab8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 13:00:15 2018 +0200 shell32: Re-add support for expanding ALLUSERSPROFILE for backward compatibility. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index dccfbba..f08474b 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -951,7 +951,8 @@ static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S',' static const WCHAR WindowsW[] = {'W','i','n','d','o','w','s',0}; static const WCHAR Windows_Sidebar_GadgetsW[] = {'W','i','n','d','o','w','s',' ','S','i','d','e','b','a','r','\\','G','a','d','g','e','t','s',0}; static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'}; -static const WCHAR AllUsersProfileW[] = {'%','P','U','B','L','I','C','%',0}; +static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'}; +static const WCHAR PublicProfileW[] = {'%','P','U','B','L','I','C','%',0}; static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'}; static const WCHAR ProgramDataVarW[] = {'%','P','r','o','g','r','a','m','D','a','t','a','%','\0'}; static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; @@ -3474,7 +3475,7 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath) strcpyW(pszPath, UserProfileW); break; case CSIDL_Type_AllUsers: - strcpyW(pszPath, AllUsersProfileW); + strcpyW(pszPath, PublicProfileW); break; case CSIDL_Type_ProgramData: strcpyW(pszPath, ProgramDataVarW); @@ -3812,6 +3813,17 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) PathAppendW(szDest, szAllUsers); PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); } + else if (!strncmpiW(szTemp, PublicProfileW, strlenW(PublicProfileW))) + { + WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; + + GetSystemDirectoryW(def_val, MAX_PATH); + strcpyW( def_val + 3, UsersPublicW ); + + hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); + PathAppendW(szDest, szAllUsers); + PathAppendW(szDest, szTemp + strlenW(PublicProfileW)); + } else if (!strncmpiW(szTemp, ProgramDataVarW, strlenW(ProgramDataVarW))) { WCHAR szProgramData[MAX_PATH], def_val[MAX_PATH];

1 0