April 2018 - Wine-Devel - list.winehq.org

[PATCH] Revert "testbot/web: Tweak ItemPage to save the Item directly."
by Francois Gouget April 21, 2018

April 21, 2018

Saving the item directly is ok when modifying it, but DBIBackend only supports saving new items through the collection. In particular the registration web page depends on that so we have no choice but to go through the collection. This reverts commit c18379abe004411ca779d4c42e26d7e7f3d72ba6. --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index c208aea31..9b9f2ff7e 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -134,16 +134,6 @@ sub SaveProperty($$$) return 1; } -sub Save($) -{ - my ($self) = @_; - - return !1 if (!$self->SaveProperties()); - - ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); - return ! defined($self->{ErrMessage}); -} - sub OnAction($$) { my ($self, $Action) = @_; -- 2.17.0

1 0

[PATCH v2] shell32: handle writing an iconresource entry in SHGetSetFolderCustomSettings
by Louis Lenders April 21, 2018

April 21, 2018

v2: -fixed a misleading comment - only print fixme when needed This fixes bug https://bugs.winehq.org/show_bug.cgi?id=44959 I also tried to write a test, that test passes on the 32-bit testbots, but somehow the last test fails on 64-bit testbots and i don`t know why. Test is at https://testbot.winehq.org/GetFile.pl?JobKey=37794&StepKey=1 Also win2003 testbot gives strange errors in a test above this one that i don`t get. See for example https://testbot.winehq.org/JobDetails.pl?Key=37794. So this goes without submitted test for now Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/shell32/shlfolder.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 9143f1e..c94c90e 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -607,12 +607,38 @@ HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT ci /*********************************************************************** * SHGetSetFolderCustomSettings * - * Only Unicode above Server 2003 + * Only Unicode above Server 2003, writes/reads from a desktop.ini */ HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, PCWSTR path, DWORD flag ) { - FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag); - return E_NOTIMPL; + static const WCHAR iconresourceW[] = {'I','c','o','n','R','e','s','o','u','r','c','e',0}; + static const WCHAR desktop_iniW[] = {'D','e','s','k','t','o','p','.','i','n','i',0}; + WCHAR bufferW[MAX_PATH]= {0}; + HRESULT hr; + + hr = E_FAIL; + + if (flag & FCS_FORCEWRITE) + { + if (fcs->dwMask & FCSM_ICONFILE) + { + lstrcpyW(bufferW, path); + PathAddBackslashW(bufferW); + lstrcatW(bufferW, desktop_iniW); + + if (WritePrivateProfileStringW(wszDotShellClassInfo, iconresourceW, fcs->pszIconFile, bufferW)) + { + TRACE("Wrote an iconresource entry %s into %s\n", debugstr_w(fcs->pszIconFile), debugstr_w(bufferW)); + hr = S_OK; + } + else + ERR("Failed to write (to) Desktop.ini file\n"); + } + } + else + FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag); + + return hr; } /*********************************************************************** -- 2.7.4

3 3

[PATCH] d3d10: Implement D3D10CompileEffectFromMemory().
by Valentin Gabriel Mitrea April 21, 2018

April 21, 2018

As MSDN documentation recommends, one should use D3DCompile() instead of D3D10CompileEffectFromMemory(). So, execution was forwarded to that function. This implementation is a possible fix for this bug: https://bugs.winehq.org/show_bug.cgi?id=36538 At the moment, there are no d3d10 tests written for shader and effect compilation functions. Signed-off-by: Valentin Gabriel Mitrea <mitrea.valentin(a)gmail.com> --- dlls/d3d10/d3d10_main.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index f2fbb41..0081e8f 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -253,17 +253,14 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, ID3D10Blob **effect, ID3D10Blob **errors) { - FIXME("data %p, data_size %lu, filename %s, defines %p, include %p," - " hlsl_flags %#x, fx_flags %#x, effect %p, errors %p stub!\n", + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, " + "hlsl_flags %#x, fx_flags %#x, effect %p, errors %p\n", data, data_size, wine_dbgstr_a(filename), defines, include, hlsl_flags, fx_flags, effect, errors); - if (effect) - *effect = NULL; - if (errors) - *errors = NULL; - - return E_NOTIMPL; + /* Forward to d3dcompiler */ + return D3DCompile(data, data_size, filename, defines, include, + NULL, "fx_4_0", hlsl_flags, fx_flags, effect, errors); } HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, -- 2.7.4

3 2

[PATCH 2/2] jscript: Remove unused prop_put arguments.
by Jacek Caban April 20, 2018

April 20, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] jscript: Remove unused prop_get arguments.
by Jacek Caban April 20, 2018

April 20, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)

1 0

[PATCH] wineandroid: Allow an initial prefix to be shipped
by André Hentschel April 20, 2018

April 20, 2018

Useful to ship winestart.cmd and more (e.g. Hangover) Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/wineandroid.drv/WineActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 3345e18..992dd9b 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -165,6 +165,7 @@ private void createProgressDialog( final int max, final String message ) private final boolean isFileWanted( String name ) { if (name.equals( "files.sum" )) return true; + if (name.startsWith( "prefix/" )) return true; if (name.startsWith( "share/" )) return true; if (name.startsWith( Build.CPU_ABI + "/system/" )) return false; if (name.startsWith( Build.CPU_ABI + "/" )) return true; -- 2.7.4

2 2

Re: [PATCH v2] Calc: Add a simple implementation.
by Alexandre Julliard April 20, 2018

April 20, 2018

Hua Meng <161220092(a)smail.nju.edu.cn> writes: > + /* create Buttons */ > + for(i = 0; i < ButtonNum; i++) > + { > + x = 15 + (i % 3) * 70; > + y = 120 + (i / 3) * 90; > + nWidth = 70; > + nHeight = 90; > + > + /* set token buttons */ > + if(i >= 12) > + { > + nHeight = 72; > + x = 225; > + y = 120 + (i % 12) * 72; > + } You can't hardcode values like this, it should depend on the font size. It would be a lot easier to start from a dialog template instead of creating everything by hand. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH] mshtml: Make set_frame_doc() static.
by Francois Gouget April 20, 2018

April 20, 2018

It is only used in one C file now. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/mshtml_private.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index e4a7a612c20..17a78e55a5f 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -39,7 +39,7 @@ static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; static const WCHAR pxW[] = {'p','x',0}; -HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) +static HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) { mozIDOMWindowProxy *mozwindow; HTMLOuterWindow *window; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ff52dae5721..0a4dfba93dc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -922,8 +922,6 @@ void init_node_cc(void) DECLSPEC_HIDDEN; HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; -HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*) DECLSPEC_HIDDEN; - void call_property_onchanged(ConnectionPointContainer*,DISPID) DECLSPEC_HIDDEN; HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*) DECLSPEC_HIDDEN; -- 2.17.0

2 1

[PATCH] msvcp140: Add _Task_impl_base::_IsNonBlockingThread stub
by Piotr Caban April 20, 2018

April 20, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 8 ++++++++ dlls/msvcp90/misc.c | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletion(-)

1 0

[PATCH] d3d11.idl: Fixed a typo in CD3D11_BLEND_DESC constructor.
by Jacek Caban April 20, 2018

April 20, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/d3d11.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0