May 2018 - Wine-commits - list.winehq.org

Jacek Caban : mshtml.idl: Added IHTMLWindow7 declaration.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: a0dfc95f452f89b854ac6e177e24f78a240e6f18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0dfc95f452f89b854ac6e17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 17 16:21:52 2018 +0200 mshtml.idl: Added IHTMLWindow7 declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 71 ++++ include/mshtml.idl | 1170 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 1211 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0dfc95f452f89b854ac…

1 0

Jacek Caban : mshtml: Added IHTMLWindow7 stub implementation.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: a30a4452145698841d27e35b744c1c463ab49125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a30a4452145698841d27e35b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 17 16:22:09 2018 +0200 mshtml: Added IHTMLWindow7 stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 347 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + 2 files changed, 349 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a30a4452145698841d27…

1 0

Jacek Caban : mshtml: Implement supported IHTMLWindow7 event properties.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: b86825acf72e1dc8ee4df9901ba531c8bae031d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b86825acf72e1dc8ee4df990… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 17 16:22:18 2018 +0200 mshtml: Implement supported IHTMLWindow7 event properties. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 50 +++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9206a32..e198ed1 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2383,7 +2383,21 @@ static HRESULT WINAPI HTMLWindow7_get_outerHeight(IHTMLWindow7 *iface, LONG *p) return E_NOTIMPL; } -#define HTMLWINDOW7_ONEVENT_PROPERTY_STUB(name) \ +#define HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(name, event_id) \ + static HRESULT WINAPI HTMLWindow7_put_on##name(IHTMLWindow7 *iface, VARIANT v) \ + { \ + HTMLWindow *This = impl_from_IHTMLWindow7(iface); \ + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); \ + return set_window_event(This, event_id, &v); \ + } \ + static HRESULT WINAPI HTMLWindow7_get_on##name(IHTMLWindow7 *iface, VARIANT *p) \ + { \ + HTMLWindow *This = impl_from_IHTMLWindow7(iface); \ + TRACE("(%p)->(%p)\n", This, p); \ + return get_window_event(This, event_id, p); \ + } + +#define HTMLWINDOW7_ONEVENT_PROPERTY_STUB(name) \ static HRESULT WINAPI HTMLWindow7_put_on##name(IHTMLWindow7 *iface, VARIANT v) \ { \ HTMLWindow *This = impl_from_IHTMLWindow7(iface); \ @@ -2397,52 +2411,52 @@ static HRESULT WINAPI HTMLWindow7_get_outerHeight(IHTMLWindow7 *iface, LONG *p) return E_NOTIMPL; \ } -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(abort) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(abort, EVENTID_ABORT) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(canplay) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(canplaythrough) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(change) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(click) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(contextmenu) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(dblclick) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(drag) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(contextmenu, EVENTID_CONTEXTMENU) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(dblclick, EVENTID_DBLCLICK) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(drag, EVENTID_DRAG) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(dragend) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(dragenter) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(dragleave) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(dragover) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(dragstart) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(dragstart, EVENTID_DRAGSTART) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(drop) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(durationchange) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(focusin) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(focusout) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(focusin, EVENTID_FOCUSIN) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(focusout, EVENTID_FOCUSOUT) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(input) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(emptied) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(ended) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(keydown) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(keypress) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(keydown, EVENTID_KEYDOWN) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(keypress, EVENTID_KEYPRESS) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(keyup) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(loadeddata) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(loadedmetadata) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(loadstart) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mousedown) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(mousedown, EVENTID_MOUSEDOWN) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mouseenter) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mouseleave) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mousemove) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mouseout) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mouseover) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mouseup) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(mousewheel) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(mousemove, EVENTID_MOUSEMOVE) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(mouseout, EVENTID_MOUSEOUT) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(mouseover, EVENTID_MOUSEOVER) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(mouseup, EVENTID_MOUSEUP) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(mousewheel, EVENTID_MOUSEWHEEL) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(offline) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(online) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(progress) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(ratechange) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(readystatechange) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(readystatechange, EVENTID_READYSTATECHANGE) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(reset) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(seeked) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(seeking) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(select) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(stalled) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(storage) -HTMLWINDOW7_ONEVENT_PROPERTY_STUB(submit) +HTMLWINDOW7_ONEVENT_PROPERTY_IMPL(submit, EVENTID_SUBMIT) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(suspend) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(timeupdate) HTMLWINDOW7_ONEVENT_PROPERTY_STUB(pause)

1 0

Zebediah Figura : msi: Avoid leaking memory on failure paths in MsiGetPropertyA().
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 2e2934e455318c2753741a051876bc0a3c2399fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e2934e455318c2753741a05… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 10:48:15 2018 -0500 msi: Avoid leaking memory on failure paths in MsiGetPropertyA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ab6c3dd..2801efa 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2368,9 +2368,14 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD DWORD len; if (!(remote = msi_get_remote(hinst))) + { + heap_free(nameW); return ERROR_INVALID_HANDLE; + } r = remote_GetProperty(remote, nameW, &value, &len); + heap_free(nameW); + if (!r) { /* String might contain embedded nulls. @@ -2388,7 +2393,6 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD heap_free(tmp); } midl_user_free(value); - heap_free(nameW); return r; }

1 0

Zebediah Figura : msi: Handle the remote case directly in MsiGetTargetPathA().
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: c9fc3510218f3426b9b448b4569ff4fd275044f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9fc3510218f3426b9b448b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 10:48:16 2018 -0500 msi: Handle the remote case directly in MsiGetTargetPathA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/install.c | 48 ++++++++++++++++++++++++++++++++++++------------ dlls/msi/tests/custom.c | 8 ++++---- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index b54daff..93f9cce 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -271,26 +271,50 @@ static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, /*********************************************************************** * MsiGetTargetPathA (MSI.@) */ -UINT WINAPI MsiGetTargetPathA( MSIHANDLE hInstall, LPCSTR szFolder, - LPSTR szPathBuf, LPDWORD pcchPathBuf ) +UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DWORD *sz) { - LPWSTR szwFolder; - awstring path; + MSIPACKAGE *package; + const WCHAR *path; + WCHAR *folderW; UINT r; - TRACE("%s %p %p\n", debugstr_a(szFolder), szPathBuf, pcchPathBuf); + TRACE("%s %p %p\n", debugstr_a(folder), buf, sz); - szwFolder = strdupAtoW(szFolder); - if (szFolder && !szwFolder) - return ERROR_FUNCTION_FAILED; + if (!folder) + return ERROR_INVALID_PARAMETER; + + if (!(folderW = strdupAtoW(folder))) + return ERROR_OUTOFMEMORY; + + package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); + if (!package) + { + WCHAR *path = NULL; + MSIHANDLE remote; - path.unicode = FALSE; - path.str.a = szPathBuf; + if (!(remote = msi_get_remote(hinst))) + { + heap_free(folderW); + return ERROR_INVALID_HANDLE; + } - r = MSI_GetTargetPath( hInstall, szwFolder, &path, pcchPathBuf ); + r = remote_GetTargetPath(remote, folderW, &path); + if (!r) + r = msi_strncpyWtoA(path, -1, buf, sz, TRUE); - msi_free( szwFolder ); + midl_user_free(path); + heap_free(folderW); + return r; + } + path = msi_get_target_folder(package, folderW); + if (path) + r = msi_strncpyWtoA(path, -1, buf, sz, FALSE); + else + r = ERROR_DIRECTORY; + + heap_free(folderW); + msiobj_release(&package->hdr); return r; } diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index d240964..4e42eed 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -485,28 +485,28 @@ static void test_targetpath(MSIHANDLE hinst) sz = 0; r = MsiGetTargetPathA(hinst, "TARGETDIR", NULL, &sz); ok(hinst, !r, "got %u\n", r); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 0; strcpy(buffer,"q"); r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 1; strcpy(buffer,"x"); r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !buffer[0], "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 3; strcpy(buffer,"x"); r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "C:"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 4; strcpy(buffer,"x");

1 0

Zebediah Figura : msi: Avoid using awstring in MsiGetTargetPathW().
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: ce3fc1af555106bcc614a1b9259172357035517f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce3fc1af555106bcc614a1b9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 10:48:17 2018 -0500 msi: Avoid using awstring in MsiGetTargetPathW(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/install.c | 80 ++++++++++++++++++++++-------------------------------- 1 file changed, 32 insertions(+), 48 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 93f9cce..31352c6 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -228,47 +228,6 @@ const WCHAR *msi_get_target_folder( MSIPACKAGE *package, const WCHAR *name ) } /*********************************************************************** - * MsiGetTargetPath (internal) - */ -static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, - awstring *szPathBuf, LPDWORD pcchPathBuf ) -{ - MSIPACKAGE *package; - const WCHAR *path; - UINT r = ERROR_FUNCTION_FAILED; - - if (!szFolder) - return ERROR_INVALID_PARAMETER; - - package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); - if (!package) - { - LPWSTR value = NULL; - MSIHANDLE remote; - - if (!(remote = msi_get_remote(hInstall))) - return ERROR_INVALID_HANDLE; - - r = remote_GetTargetPath(remote, szFolder, &value); - if (r != ERROR_SUCCESS) - return r; - - r = msi_strcpy_to_awstring(value, -1, szPathBuf, pcchPathBuf); - - midl_user_free(value); - return r; - } - - path = msi_get_target_folder( package, szFolder ); - msiobj_release( &package->hdr ); - - if (!path) - return ERROR_DIRECTORY; - - return msi_strcpy_to_awstring( path, -1, szPathBuf, pcchPathBuf ); -} - -/*********************************************************************** * MsiGetTargetPathA (MSI.@) */ UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DWORD *sz) @@ -321,17 +280,42 @@ UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DW /*********************************************************************** * MsiGetTargetPathW (MSI.@) */ -UINT WINAPI MsiGetTargetPathW( MSIHANDLE hInstall, LPCWSTR szFolder, - LPWSTR szPathBuf, LPDWORD pcchPathBuf ) +UINT WINAPI MsiGetTargetPathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf, DWORD *sz) { - awstring path; + MSIPACKAGE *package; + const WCHAR *path; + UINT r; - TRACE("%s %p %p\n", debugstr_w(szFolder), szPathBuf, pcchPathBuf); + TRACE("%s %p %p\n", debugstr_w(folder), buf, sz); - path.unicode = TRUE; - path.str.w = szPathBuf; + if (!folder) + return ERROR_INVALID_PARAMETER; + + package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); + if (!package) + { + WCHAR *path = NULL; + MSIHANDLE remote; - return MSI_GetTargetPath( hInstall, szFolder, &path, pcchPathBuf ); + if (!(remote = msi_get_remote(hinst))) + return ERROR_INVALID_HANDLE; + + r = remote_GetTargetPath(remote, folder, &path); + if (!r) + r = msi_strncpyW(path, -1, buf, sz); + + midl_user_free(path); + return r; + } + + path = msi_get_target_folder(package, folder); + if (path) + r = msi_strncpyW(path, -1, buf, sz); + else + r = ERROR_DIRECTORY; + + msiobj_release(&package->hdr); + return r; } static WCHAR *get_source_root( MSIPACKAGE *package )

1 0

Zebediah Figura : msi: Handle the remote case directly in MsiGetSourcePathA().
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 43ce218a48f5b3420f48379e911e974b8bb9ef88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43ce218a48f5b3420f48379e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 10:48:18 2018 -0500 msi: Handle the remote case directly in MsiGetSourcePathA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/install.c | 48 ++++++++++++++++++++++++++++++++++++++---------- dlls/msi/tests/custom.c | 8 ++++---- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 31352c6..d62fe26 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -421,22 +421,50 @@ static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR szFolder, /*********************************************************************** * MsiGetSourcePathA (MSI.@) */ -UINT WINAPI MsiGetSourcePathA( MSIHANDLE hInstall, LPCSTR szFolder, - LPSTR szPathBuf, LPDWORD pcchPathBuf ) +UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DWORD *sz) { - LPWSTR folder; - awstring str; + MSIPACKAGE *package; + const WCHAR *path; + WCHAR *folderW; UINT r; - TRACE("%s %p %p\n", debugstr_a(szFolder), szPathBuf, pcchPathBuf); + TRACE("%s %p %p\n", debugstr_a(folder), buf, sz); + + if (!folder) + return ERROR_INVALID_PARAMETER; + + if (!(folderW = strdupAtoW(folder))) + return ERROR_OUTOFMEMORY; + + package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); + if (!package) + { + WCHAR *path = NULL; + MSIHANDLE remote; + + if (!(remote = msi_get_remote(hinst))) + { + heap_free(folderW); + return ERROR_INVALID_HANDLE; + } - str.unicode = FALSE; - str.str.a = szPathBuf; + r = remote_GetSourcePath(remote, folderW, &path); + if (!r) + r = msi_strncpyWtoA(path, -1, buf, sz, TRUE); + + midl_user_free(path); + heap_free(folderW); + return r; + } - folder = strdupAtoW( szFolder ); - r = MSI_GetSourcePath( hInstall, folder, &str, pcchPathBuf ); - msi_free( folder ); + path = msi_resolve_source_folder(package, folderW, NULL); + if (path) + r = msi_strncpyWtoA(path, -1, buf, sz, FALSE); + else + r = ERROR_DIRECTORY; + heap_free(folderW); + msiobj_release(&package->hdr); return r; } diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 4e42eed..ff1be9b 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -584,28 +584,28 @@ static void test_targetpath(MSIHANDLE hinst) sz = 0; r = MsiGetSourcePathA(hinst, "TARGETDIR", NULL, &sz); ok(hinst, !r, "got %u\n", r); - todo_wine_ok(hinst, sz == srcsz * 2, "got size %u\n", sz); + ok(hinst, sz == srcsz * 2, "got size %u\n", sz); sz = 0; strcpy(buffer,"q"); r = MsiGetSourcePathA(hinst, "TARGETDIR", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == srcsz * 2, "got size %u\n", sz); + ok(hinst, sz == srcsz * 2, "got size %u\n", sz); sz = 1; strcpy(buffer,"x"); r = MsiGetSourcePathA(hinst, "TARGETDIR", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !buffer[0], "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == srcsz * 2, "got size %u\n", sz); + ok(hinst, sz == srcsz * 2, "got size %u\n", sz); sz = srcsz; strcpy(buffer,"x"); r = MsiGetSourcePathA(hinst, "TARGETDIR", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, strlen(buffer) == srcsz - 1, "wrong buffer length %d\n", strlen(buffer)); - todo_wine_ok(hinst, sz == srcsz * 2, "got size %u\n", sz); + ok(hinst, sz == srcsz * 2, "got size %u\n", sz); sz = srcsz + 1; strcpy(buffer,"x");

1 0

Kyle Auble : Tighten up URL validation in news plugin
by Jeremy Newman 17 May '18

17 May '18

Module: website Branch: master Commit: 5cd195b1ac9ff47e92b8b31526212c4915be048e URL: https://source.winehq.org/git/website.git/?a=commit;h=5cd195b1ac9ff47e92b8b… Author: Kyle Auble <kauble7(a)gmail.com> Date: Sat May 12 20:21:31 2018 -0400 Tighten up URL validation in news plugin >From d3a7af7eca5c14ec48202eef65e3d8eb55aee459 Mon Sep 17 00:00:00 2001 From: Kyle Auble <kauble7(a)gmail.com> Date: Thu, 10 May 2018 17:19:24 -0400 Subject: [PATCH website] Tighten up URL validation in news plugin Fixes https://bugs.winehq.org/show_bug.cgi?id=44764 Signed-off-by: Kyle Auble <kauble7(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/plugins/news.php | 59 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index 3d78b74..94f18e3 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -10,19 +10,53 @@ if (!empty($_GET['lang']) and in_array($_GET['lang'], $config->languages)) $html->lang = $_GET['lang']; -// display news based on page params -switch (true) +// Display news based on page params +// The news plugin expects a narrow range of options though... +// ... so scrub out anything except relevant values + +// If there are no potential parameters in the URL... +if (!defined('PAGE_PARAMS')) + $flag = 'default'; + +// If a specific date is referenced... +else if (preg_match("/[0-9]{10}/", PAGE_PARAMS, $matches)) +{ + $item = $matches[0] . '.xml'; + $vars = array(); + + // Ensure valid news actually exists for this date + if (file_exists($config->news_xml_path.'/'.$html->lang.'/'.$item)) + { + $vars = get_xml_tags($config->news_xml_path.'/'.$html->lang.'/'.$item, array('date', 'title', 'link', 'body')); + $flag = 'single'; + } + else if (file_exists($config->news_xml_path.'/'.$config->lang.'/'.$item)) + { + $vars = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'link', 'body')); + $flag = 'single'; + } + else + $flag = 'default'; +} + +// If the RSS feed is requested specifically... +else if (preg_match("/rss/", PAGE_PARAMS)) +{ + $feed = 'xml'; + $flag = 'rss'; +} + +// Anything else... +else + $flag = 'default'; + +// Now handle the details based on the control flag +switch ($flag) { // single issue view - case (defined('PAGE_PARAMS') and preg_match("/[0-9]{10}/", PAGE_PARAMS)): + case 'single': - // get data from XML file - $item = PAGE_PARAMS . '.xml'; - $vars = array(); - if (file_exists($config->news_xml_path.'/'.$html->lang.'/'.$item)) - $vars = get_xml_tags($config->news_xml_path.'/'.$html->lang.'/'.$item, array('date', 'title', 'link', 'body')); - else - $vars = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'link', 'body')); + // The single flag guarantees vars already has the news path // set open graph tags $html->meta_og['title'] = trim($vars['title']); @@ -57,12 +91,13 @@ switch (true) echo $html->template('base', 'news_row', $vars); echo $html->p($html->ahref('<span class="glyphicon glyphicon-backward"></span>', "{$html->_web_root}/news", 'class="btn btn-default"')); break; + // end single issue // RSS view - case (defined('PAGE_PARAMS') and PAGE_PARAMS == "rss"): + case 'rss': // get list of news items - $news = get_files($config->news_xml_path."/".$config->lang, "xml"); + $news = get_files($config->news_xml_path."/".$config->lang, $feed); $news = array_reverse ($news); // clear cache and output the rss file

1 0

Pablo Martin : d3d11/tests: Add test for CopySubresourceRegion1.
by Alexandre Julliard 16 May '18

16 May '18

Module: wine Branch: master Commit: d5dc2ecf6b22e3a10e15a74abaf93ad78fdad6c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5dc2ecf6b22e3a10e15a74a… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Wed May 16 11:30:33 2018 +0200 d3d11/tests: Add test for CopySubresourceRegion1. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c6509ca..540a0b7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11455,6 +11455,7 @@ static void test_copy_subresource_region(void) ID3D11ShaderResourceView *ps_srv; D3D11_SAMPLER_DESC sampler_desc; ID3D11DeviceContext *context; + ID3D11DeviceContext1 *context1; struct vec4 float_colors[16]; struct resource_readback rb; ID3D11PixelShader *ps; @@ -11643,6 +11644,42 @@ static void test_copy_subresource_region(void) } release_resource_readback(&rb); + hr = ID3D11DeviceContext_QueryInterface(context, &IID_ID3D11DeviceContext1, (void **)&context1); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Failed to query ID3D11DeviceContext1, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + { + ID3D11DeviceContext1_ClearRenderTargetView(context1, test_context.backbuffer_rtv, red); + check_texture_color(test_context.backbuffer, 0x800000ff, 2); + + memset(float_colors, 0, sizeof(float_colors)); + ID3D11DeviceContext1_UpdateSubresource1(context1, (ID3D11Resource *)dst_texture, 0, NULL, + float_colors, 0, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0x00000000, 1); + + ID3D11DeviceContext1_CopySubresourceRegion1(context1, (ID3D11Resource *)dst_texture, 0, + 0, 0, 0, (ID3D11Resource *)src_texture, 0, NULL, 0); + draw_quad(&test_context); + + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D11DeviceContext1_Release(context1); + } + + ID3D11PixelShader_Release(ps); hr = ID3D11Device_CreatePixelShader(device, ps_buffer_code, sizeof(ps_buffer_code), NULL, &ps); ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr);

1 0

Józef Kucia : d3d11/tests: Add test for sampleinfo instruction.
by Alexandre Julliard 16 May '18

16 May '18

Module: wine Branch: master Commit: 1721a02448a4d180a129756a12b366f0d87e9f78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1721a02448a4d180a129756a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 16 11:55:24 2018 +0200 d3d11/tests: Add test for sampleinfo instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 540a0b7..b64cf33 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -19863,6 +19863,144 @@ static void test_sm5_bufinfo_instruction(void) release_test_context(&test_context); } +static void test_sampleinfo_instruction(void) +{ + ID3D11Texture2D *float_rt_texture, *uint_rt_texture; + ID3D11RenderTargetView *float_rtv, *uint_rtv; + struct d3d11_test_context test_context; + ID3D11PixelShader *ps_float, *ps_uint; + unsigned int sample_count, quality; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11RenderTargetView *rtvs[2]; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + struct uvec4 expected_uint; + struct vec4 expected_float; + ID3D11Resource *texture; + ID3D11Device *device; + HRESULT hr; + + static const DWORD ps_uint_code[] = + { +#if 0 + Texture2DMS<float> t; + + uint4 main() : SV_Target1 + { + uint width, height, sample_count; + t.GetDimensions(width, height, sample_count); + return sample_count; + } +#endif + 0x43425844, 0x4342ad12, 0x19addd8c, 0x5cb87c48, 0xe604a242, 0x00000001, 0x000000d4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000001, 0x00000000, 0x00000001, 0x00000001, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000005c, 0x00000050, 0x00000017, + 0x0100086a, 0x04002058, 0x00107000, 0x00000000, 0x00005555, 0x03000065, 0x001020f2, 0x00000001, + 0x02000068, 0x00000001, 0x0500086f, 0x00100012, 0x00000000, 0x0010700a, 0x00000000, 0x05000036, + 0x001020f2, 0x00000001, 0x00100006, 0x00000000, 0x0100003e, + }; + static const DWORD ps_float_code[] = + { +#if 0 + Texture2DMS<float> t; + + float4 main() : SV_Target + { + uint width, height, sample_count; + t.GetDimensions(width, height, sample_count); + return sample_count; + } +#endif + 0x43425844, 0x2b8aea46, 0x34ceda6f, 0xf98d222b, 0x235ebc0b, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000040, 0x00000050, 0x00000010, + 0x0100086a, 0x04002058, 0x00107000, 0x00000000, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, + 0x0500006f, 0x001020f2, 0x00000000, 0x0010700a, 0x00000000, 0x0100003e, + }; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 64; + texture_desc.Height = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &float_rt_texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)float_rt_texture, NULL, &float_rtv); + ok(hr == S_OK, "Failed to create rendertarget view, hr %#x.\n", hr); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &uint_rt_texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)uint_rt_texture, NULL, &uint_rtv); + ok(hr == S_OK, "Failed to create rendertarget view, hr %#x.\n", hr); + + rtvs[0] = float_rtv; + rtvs[1] = uint_rtv; + ID3D11DeviceContext_OMSetRenderTargets(context, ARRAY_SIZE(rtvs), rtvs, NULL); + + hr = ID3D11Device_CreatePixelShader(device, ps_float_code, sizeof(ps_float_code), NULL, &ps_float); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_uint_code, sizeof(ps_uint_code), NULL, &ps_uint); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + for (sample_count = 2; sample_count <= 8; sample_count *= 2) + { + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = sample_count; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; + + hr = ID3D11Device_CheckMultisampleQualityLevels(device, texture_desc.Format, sample_count, &quality); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!quality) + { + skip("Sample count %u not supported.\n", sample_count); + continue; + } + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&texture); + ok(hr == S_OK, "Failed to create texture, hr %#x, sample count %u.\n", hr, sample_count); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + + ID3D11DeviceContext_PSSetShader(context, ps_float, NULL, 0); + draw_quad(&test_context); + ID3D11DeviceContext_PSSetShader(context, ps_uint, NULL, 0); + draw_quad(&test_context); + + expected_float.x = expected_float.y = expected_float.z = expected_float.w = sample_count; + check_texture_vec4(float_rt_texture, &expected_float, 0); + expected_uint.x = expected_uint.y = expected_uint.z = expected_uint.w = sample_count; + check_texture_uvec4(uint_rt_texture, &expected_uint); + + ID3D11Resource_Release(texture); + ID3D11ShaderResourceView_Release(srv); + } + + ID3D11RenderTargetView_Release(float_rtv); + ID3D11RenderTargetView_Release(uint_rtv); + ID3D11Texture2D_Release(float_rt_texture); + ID3D11Texture2D_Release(uint_rt_texture); + ID3D11PixelShader_Release(ps_float); + ID3D11PixelShader_Release(ps_uint); + release_test_context(&test_context); +} + static void test_render_target_device_mismatch(void) { struct d3d11_test_context test_context; @@ -26798,6 +26936,7 @@ START_TEST(d3d11) test_primitive_restart(); test_resinfo_instruction(); test_sm5_bufinfo_instruction(); + test_sampleinfo_instruction(); test_render_target_device_mismatch(); test_buffer_srv(); run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0,

1 0