winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2013
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
411 discussions
Start a n
N
ew thread
Tag wine-1.6-rc1 : Alexandre Julliard : Release 1.6-rc1
by Alexandre Julliard
07 Jun '13
07 Jun '13
Module: wine Branch: refs/tags/wine-1.6-rc1 Tag: 8e19f600d1df68d9f9599b15b8395b290f19e81c URL:
http://source.winehq.org/git/wine.git/?a=tag;h=8e19f600d1df68d9f9599b15b839…
Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 21:48:24 2013 +0200 Release 1.6-rc1
1
0
0
0
Alexandre Julliard : Release 1.6-rc1.
by Alexandre Julliard
07 Jun '13
07 Jun '13
Module: wine Branch: master Commit: 1c81dbd1c2e35e9d4191d3a32a15d3a22fac5525 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1c81dbd1c2e35e9d4191d3a32…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 21:48:24 2013 +0200 Release 1.6-rc1. --- ANNOUNCE | 738 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 399 insertions(+), 359 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c81dbd1c2e35e9d4191d…
1
0
0
0
Dmitry Timoshkov : ole32: Add a basic OLE client/server test suite.
by Alexandre Julliard
07 Jun '13
07 Jun '13
Module: wine Branch: master Commit: eeca784b708ce44257b78bf1e8c291eeccf5d8c2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=eeca784b708ce44257b78bf1e…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 6 18:36:40 2013 +0900 ole32: Add a basic OLE client/server test suite. --- dlls/ole32/tests/Makefile.in | 1 + dlls/ole32/tests/ole_server.c | 486 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 487 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=eeca784b708ce44257b78…
1
0
0
0
Hans Leidekker : kernel32/tests: Avoid test failures when running as an unprivileged user.
by Alexandre Julliard
07 Jun '13
07 Jun '13
Module: wine Branch: master Commit: af7062a94f071961aa9486a3b4d1af1dfa5c8948 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=af7062a94f071961aa9486a3b…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 7 15:35:35 2013 +0200 kernel32/tests: Avoid test failures when running as an unprivileged user. --- dlls/kernel32/tests/file.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 65ff18c..eff6ad1 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3504,7 +3504,8 @@ static void test_SetFileValidData(void) if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token) || !LookupPrivilegeValue(NULL, SE_MANAGE_VOLUME_NAME, &privs.Privileges[0].Luid) || - !AdjustTokenPrivileges(token, FALSE, &privs, sizeof(privs), NULL, NULL)) + !AdjustTokenPrivileges(token, FALSE, &privs, sizeof(privs), NULL, NULL) || + GetLastError() == ERROR_NOT_ALL_ASSIGNED) { win_skip("cannot enable SE_MANAGE_VOLUME_NAME privilege\n"); CloseHandle(token);
1
0
0
0
Alistair Leslie-Hughes : wine.inf: Install oledb32 into the correct directory.
by Alexandre Julliard
07 Jun '13
07 Jun '13
Module: wine Branch: master Commit: 28e80addf87fa512ec9cbf57fc86e214bf548e83 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=28e80addf87fa512ec9cbf57f…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 7 14:06:34 2013 +1000 wine.inf: Install oledb32 into the correct directory. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index c82173d..45fca8f 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2538,6 +2538,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,wbem,wmic.exe 11,wbem,wmiutils.dll 16422,Internet Explorer,iexplore.exe +16427,System\OLE DB,oledb32.dll 11,,* [SystemIni]
1
0
0
0
Christian Costa : d3dxof: Add test for more complex object.
by Alexandre Julliard
07 Jun '13
07 Jun '13
Module: wine Branch: master Commit: 65d7a8b3d10a35b619c0b2da25dfe243b4e189f8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=65d7a8b3d10a35b619c0b2da2…
Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jun 6 23:30:17 2013 +0200 d3dxof: Add test for more complex object. --- dlls/d3dxof/tests/d3dxof.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 83fd23d..8d322ad 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -327,6 +327,46 @@ static char object_syntax_string_with_separator[] = "\"foo;bar\";\n" "}\n"; +static char templates_complex_object[] = +"xof 0302txt 0064\n" +"template Vector\n" +"{\n" +"<3D82AB5E-62DA-11CF-AB39-0020AF71E433>\n" +"FLOAT x;\n" +"FLOAT y;\n" +"FLOAT z;\n" +"}\n" +"template MeshFace\n" +"{\n" +"<3D82AB5F-62DA-11CF-AB39-0020AF71E433>\n" +"DWORD nFaceVertexIndices;\n" +"array DWORD faceVertexIndices[nFaceVertexIndices];\n" +"}\n" +"template Mesh\n" +"{\n" +"<3D82AB44-62DA-11CF-AB39-0020AF71E433>\n" +"DWORD nVertices;\n" +"array Vector vertices[nVertices];\n" +"DWORD nFaces;\n" +"array MeshFace faces[nFaces];\n" +"[...]\n" +"}\n"; + +static char object_complex[] = +"xof 0302txt 0064\n" +"Mesh Object\n" +"{\n" +"4;;;,\n" +"1.0;;;, 0.0;;;, 0.0;;;,\n" +"0.0;;;, 1.0;;;, 0.0;;;,\n" +"0.0;;;, 0.0;;;, 1.0;;;,\n" +"1.0;;;, 1.0;;;, 1.0;;;,\n" +"3;;;,\n" +"3;;;, 0;;;, 1;;;, 2;;;,\n" +"3;;;, 1;;;, 2;;;, 3;;;,\n" +"3;;;, 3;;;, 1;;;, 2;;;,\n" +"}\n"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -938,6 +978,42 @@ static void test_syntax_semicolon_comma(void) IDirectXFile_Release(dxfile); } +static void test_complex_object(void) +{ + HRESULT ret; + IDirectXFile *dxfile = NULL; + IDirectXFileEnumObject *enum_object; + IDirectXFileData *file_data; + DXFILELOADMEMORY load_info; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + ret = pDirectXFileCreate(&dxfile); + ok(ret == DXFILE_OK, "DirectXFileCreate failed with %#x\n", ret); + if (!dxfile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + ret = IDirectXFile_RegisterTemplates(dxfile, templates_complex_object, sizeof(templates_complex_object) - 1); + ok(ret == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates failed with %#x\n", ret); + + load_info.lpMemory = object_complex; + load_info.dSize = sizeof(object_complex) - 1; + ret = IDirectXFile_CreateEnumObject(dxfile, &load_info, DXFILELOAD_FROMMEMORY, &enum_object); + ok(ret == DXFILE_OK, "IDirectXFile_CreateEnumObject failed with %#x\n", ret); + ret = IDirectXFileEnumObject_GetNextDataObject(enum_object, &file_data); + ok(ret == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject failed with %#x\n", ret); + + IDirectXFileData_Release(file_data); + IDirectXFileEnumObject_Release(enum_object); + IDirectXFile_Release(dxfile); +} /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -1122,6 +1198,7 @@ START_TEST(d3dxof) test_getname(); test_syntax(); test_syntax_semicolon_comma(); + test_complex_object(); test_dump(); FreeLibrary(hd3dxof);
1
0
0
0
Alistair Leslie-Hughes : oledb32: Correct DBPROP_INIT_HWND type for Win64.
by Alexandre Julliard
07 Jun '13
07 Jun '13
Module: wine Branch: master Commit: ad008e223a3d89f828d6f2d1cd542a56ab5ad2d4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ad008e223a3d89f828d6f2d1c…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 6 15:13:29 2013 +1000 oledb32: Correct DBPROP_INIT_HWND type for Win64. --- dlls/oledb32/datainit.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index b6ba0e1..dba3087 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -298,7 +298,7 @@ struct dbproperty { static const WCHAR conn_timeout[] = {'C','o','n','n','e','c','t',' ','T','i','m','e','o','u','t',0}; static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; -static const WCHAR extemdedW[] = {'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s',0}; +static const WCHAR extendedW[] = {'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s',0}; static const WCHAR gen_timeout[] = {'G','e','n','e','r','a','l',' ','T','i','m','e','o','u','t',0}; static const WCHAR initcatW[] = {'I','n','i','t','i','a','l',' ','C','a','t','a','l','o','g',0}; static const WCHAR localeIDW[] = {'L','o','c','a','l','e',' ','I','d','e','n','t','i','f','i','e','r',0}; @@ -306,7 +306,7 @@ static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0}; static const WCHAR modeW[] = {'M','o','d','e',0}; static const WCHAR oledbservW[] = {'O','L','E',' ','D','B',' ','S','e','r','v','i','c','i','e','s',0}; static const WCHAR passwordW[] = {'P','a','s','s','w','o','r','d',0}; -static const WCHAR persiststW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; +static const WCHAR persistW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; static const WCHAR promptW[] = {'P','r','o','m','p','t',0}; static const WCHAR useridW[] = {'U','s','e','r',' ','I','D',0}; static const WCHAR winhandleW[] = {'W','i','n','d','o','w',' ','H','a','n','d','l','e',0}; @@ -314,7 +314,7 @@ static const WCHAR winhandleW[] = {'W','i','n','d','o','w',' ','H','a','n','d',' static const struct dbproperty dbproperties[] = { { conn_timeout,DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, - { extemdedW, DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { extendedW, DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, { gen_timeout, DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { initcatW, DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, { localeIDW, DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, @@ -322,12 +322,17 @@ static const struct dbproperty dbproperties[] = { { modeW, DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { oledbservW, DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { passwordW, DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, - { persiststW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { persistW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, { promptW, DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, { useridW, DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, +#ifndef _WIN64 { winhandleW, DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I4 }, +#else + { winhandleW, DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I8 }, +#endif }; + static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset) { VARIANT src, dest;
1
0
0
0
Christian Costa : d3dx9_36: Simplify code + fix typo.
by Alexandre Julliard
07 Jun '13
07 Jun '13
Module: wine Branch: master Commit: cfe08e719b87308888cd34e89d4228365b7b0672 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cfe08e719b87308888cd34e89…
Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jun 6 08:57:44 2013 +0200 d3dx9_36: Simplify code + fix typo. --- dlls/d3dx9_36/mesh.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 82b3134..f38a79e 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2657,7 +2657,7 @@ static HRESULT parse_texture_filename(ID3DXFileData *filedata, LPSTR *filename_o hr = filedata->lpVtbl->Lock(filedata, &data_size, (const void**)&data); if (FAILED(hr)) return hr; - /* FIXME: String must be retreive directly instead through a pointer once ID3DXFILE is fixed */ + /* FIXME: String must be retrieved directly instead of through a pointer once ID3DXFILE is fixed */ if (data_size < sizeof(LPSTR)) { WARN("truncated data (%lu bytes)\n", data_size); filedata->lpVtbl->Unlock(filedata); @@ -2864,11 +2864,8 @@ static HRESULT parse_material_list(ID3DXFileData *filedata, struct mesh_data *me if (num_materials != mesh->num_materials) { WARN("only %u of %u materials defined\n", num_materials, mesh->num_materials); hr = E_FAIL; - goto end; } - hr = D3D_OK; - end: filedata->lpVtbl->Unlock(filedata); return hr; @@ -3125,8 +3122,6 @@ static HRESULT parse_skin_mesh_info(ID3DXFileData *filedata, struct mesh_data *m data += 2 * sizeof(WORD); mesh_data->nb_bones = *(WORD*)data; hr = D3DXCreateSkinInfoFVF(mesh_data->num_vertices, mesh_data->fvf, mesh_data->nb_bones, &mesh_data->skin_info); - if (FAILED(hr)) - goto end; } else { const char *name; DWORD nb_influences; @@ -3150,12 +3145,8 @@ static HRESULT parse_skin_mesh_info(ID3DXFileData *filedata, struct mesh_data *m if (SUCCEEDED(hr)) hr = mesh_data->skin_info->lpVtbl->SetBoneOffsetMatrix(mesh_data->skin_info, index, (const D3DMATRIX*)(data + nb_influences * (sizeof(DWORD) + sizeof(FLOAT)))); - if (FAILED(hr)) - goto end; } - hr = D3D_OK; - end: filedata->lpVtbl->Unlock(filedata); return hr;
1
0
0
0
Detlef Riekenberg : mpr/tests: Handle result from the AppV virtual drive.
by Alexandre Julliard
07 Jun '13
07 Jun '13
Module: wine Branch: master Commit: d63a160c2434f8efea0ec6794b9c6c94237f21c6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d63a160c2434f8efea0ec6794…
Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jun 6 19:26:05 2013 +0200 mpr/tests: Handle result from the AppV virtual drive. --- dlls/mpr/tests/mpr.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 90e1aec..6a15ebf 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -57,7 +57,8 @@ static void test_WNetGetUniversalName(void) if(drive_type == DRIVE_REMOTE) todo_wine ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); else - ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, + "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); fail_size = sizeof(driveA) / sizeof(char) - 1; ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, @@ -104,7 +105,8 @@ static void test_WNetGetRemoteName(void) if(drive_type == DRIVE_REMOTE) ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); else - ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, + "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); } ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); @@ -115,7 +117,8 @@ static void test_WNetGetRemoteName(void) if(drive_type == DRIVE_REMOTE) ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); else - ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, + "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); } ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, NULL); @@ -129,8 +132,8 @@ static void test_WNetGetRemoteName(void) (drive_type == DRIVE_REMOTE)) ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); else - ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA failed: %08x\n", ret); - } + ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, + "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); } fail_size = sizeof(driveA) / sizeof(char) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, @@ -150,7 +153,8 @@ static void test_WNetGetRemoteName(void) if(drive_type == DRIVE_REMOTE) ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); else - ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameW gave wrong error: %08x\n", ret); + ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, + "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); } ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); }
1
0
0
0
Ken Thomases : winemac: Allow clicks on owned windows to reorder them relative to other owned windows of the same owner .
by Alexandre Julliard
07 Jun '13
07 Jun '13
Module: wine Branch: master Commit: d22ac28f5e257cd0eb302322f2c039d124871cad URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d22ac28f5e257cd0eb302322f…
Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 7 04:26:33 2013 -0500 winemac: Allow clicks on owned windows to reorder them relative to other owned windows of the same owner. --- dlls/winemac.drv/cocoa_app.m | 42 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index fe9648b..fd481e5 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1424,16 +1424,50 @@ int macdrv_err_on; - (void) handleMouseButton:(NSEvent*)theEvent { - WineWindow* window; + WineWindow* window = (WineWindow*)[theEvent window]; + NSEventType type = [theEvent type]; + + if ([window isKindOfClass:[WineWindow class]] && + type == NSLeftMouseDown && + (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) + { + NSWindowButton windowButton; + BOOL broughtWindowForward = TRUE; + + /* Any left-click on our window anyplace other than the close or + minimize buttons will bring it forward. */ + for (windowButton = NSWindowCloseButton; + windowButton <= NSWindowMiniaturizeButton; + windowButton++) + { + NSButton* button = [window standardWindowButton:windowButton]; + if (button) + { + NSPoint point = [button convertPoint:[theEvent locationInWindow] fromView:nil]; + if ([button mouse:point inRect:[button bounds]]) + { + broughtWindowForward = FALSE; + break; + } + } + } + + if (broughtWindowForward) + { + // Clicking on a child window does not normally reorder it with + // respect to its siblings, but we want it to. We have to do it + // manually. + NSWindow* parent = [window parentWindow]; + [parent removeChildWindow:window]; + [parent addChildWindow:window ordered:NSWindowAbove]; + } + } if (mouseCaptureWindow) window = mouseCaptureWindow; - else - window = (WineWindow*)[theEvent window]; if ([window isKindOfClass:[WineWindow class]]) { - NSEventType type = [theEvent type]; BOOL pressed = (type == NSLeftMouseDown || type == NSRightMouseDown || type == NSOtherMouseDown); CGPoint pt = CGEventGetLocation([theEvent CGEvent]); BOOL process;
1
0
0
0
← Newer
1
...
26
27
28
29
30
31
32
...
42
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
Results per page:
10
25
50
100
200