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

Austin English : d3dx9_35: Sort specfile.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 661e81de6229373cb67a3419a57e633b4c13a48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=661e81de6229373cb67a3419a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:11 2017 -0500 d3dx9_35: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_35/d3dx9_35.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec index 975a2c4..2f51ece 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.spec @@ -74,18 +74,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh(ptr ptr) @ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stub D3DXCreatePRTBuffer(long long long ptr) @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -120,6 +120,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @@ -138,7 +139,6 @@ @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) @@ -174,11 +174,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -253,23 +253,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -282,12 +265,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)

1 0

Austin English : d3dx9_36: Sort specfile.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 131837eaafdaed9c534c70e26702870c08bcaab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=131837eaafdaed9c534c70e26… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:12 2017 -0500 d3dx9_36: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_36.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index a5caf3a..0408ff9 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh(ptr ptr) @ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stub D3DXCreatePRTBuffer(long long long ptr) @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @@ -139,7 +140,6 @@ @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) @@ -176,11 +176,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -255,23 +255,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -284,12 +267,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)

1 0

Rosanne DiMesio : admin.php: add functions to delete orphan versions and comments
by Jeremy Newman 30 May '17

30 May '17

Module: appdb Branch: master Commit: 37f72a60b0231e0478aba1f4574f9dcc326959b6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=37f72a60b0231e0478aba1f4… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue May 30 10:20:12 2017 -0500 admin.php: add functions to delete orphan versions and comments The cron cleanup script identifies orphan versions but does not delete them, and admins have had no way to delete them. Bug 26958 stayed open for 6 years because admins had no way to delete orphan comments. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/admin.php b/admin.php index 90d1fc8..f38924d 100644 --- a/admin.php +++ b/admin.php @@ -203,11 +203,30 @@ function fixNoteLinks() } +function deleteOrphanComments() +{ + $sQuery = "DELETE FROM appComments WHERE NOT EXISTS( SELECT appVersion.versionId FROM appVersion"; + $sQuery.= " WHERE appVersion.versionId = appComments.versionId )"; + $hResult = query_parameters($sQuery); + + echo "Deleted ".query_affected_rows()." orphan comments. "; +} + +function deleteOrphanVersions() +{ + $sQuery = "DELETE FROM appVersion WHERE appId = 0 and state != 'deleted'"; + $hResult = query_parameters($sQuery); + + echo "Deleted ".query_affected_rows()." orphan versions. "; +} + function showChoices() { echo '<a href="admin.php?sAction=fixNoteLinks">Fix/Show note links</a> '; echo '<a href="admin.php?sAction=updateAppMaintainerStates">Update application maintainer states</a> '; echo '<a href="admin.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a> '; + echo '<a href="admin.php?sAction=deleteOrphanComments">Delete Orphan Comments</a> '; + echo '<a href="admin.php?sAction=deleteOrphanVersions">Delete Orphan Versions</a> '; } switch(getInput('sAction', $aClean)) @@ -223,7 +242,15 @@ switch(getInput('sAction', $aClean)) case 'fixNoteLinks': fixNoteLinks(); break; - + + case 'deleteOrphanComments': + deleteOrphanComments(); + break; + + case 'deleteOrphanVersions': + deleteOrphanVersions(); + break; + default: showChoices(); break;

1 0

Rosanne DiMesio : Allow admins to view comments in unmaintained entries
by Jeremy Newman 30 May '17

30 May '17

Module: appdb Branch: master Commit: 1868edfb61cda174f9c3a364ab1071d8ebf6a081 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1868edfb61cda174f9c3a364… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue May 30 12:00:50 2017 -0500 Allow admins to view comments in unmaintained entries Needed for comment cleanup in unmaintained entries. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/version.php b/include/version.php index 45459fd..2c09be7 100644 --- a/include/version.php +++ b/include/version.php @@ -1164,7 +1164,7 @@ EOT; // Comments Section echo "<h2 id=\"viewComments\" class=\"whq-app-title\">Comments</h2>\n"; - if(sizeof($aMaintainers)>0) + if((sizeof($aMaintainers)>0) || ($_SESSION['current']->hasPriv("admin"))) { if($this->iVersionId) Comment::view_app_comments($this->iVersionId);

1 0

Rosanne DiMesio : Allow Extra Comments text to wrap
by Jeremy Newman 30 May '17

30 May '17

Module: appdb Branch: master Commit: 1a4adc1cc21ffb878bf5b9b8d92833bdc591e669 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1a4adc1cc21ffb878bf5b9b8… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue May 30 13:56:58 2017 -0500 Allow Extra Comments text to wrap Wraps text in the Extra Comments field to the window so users don't have to scroll horizontally. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/testData.php b/include/testData.php index 8ba45c1..07918bb 100644 --- a/include/testData.php +++ b/include/testData.php @@ -524,7 +524,7 @@ class testData{ return "What works\n{$this->shWhatWorks}\n". "What does not\n{$this->shWhatDoesnt}\n". "What was not tested\n{$this->shWhatNotTested}\n". - "Additional Comments\n<pre>{$this->sComments}</pre>\n"; + "Additional Comments\n<pre style='white-space: pre-wrap;'>{$this->sComments}</pre>\n"; } function CreateTestTable()

1 0

Alexandre Julliard : Wine release 2.9
by Alexandre Julliard 26 May '17

26 May '17

Module: website Branch: master Commit: bd3a62fc62b9ab583938e8b6525b74bcf2c72f4a URL: http://source.winehq.org/git/website.git/?a=commit;h=bd3a62fc62b9ab583938e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 09:40:35 2017 +0200 Wine release 2.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017052601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2017052601.xml b/news/en/2017052601.xml new file mode 100644 index 0000000..9374dca --- /dev/null +++ b/news/en/2017052601.xml @@ -0,0 +1,16 @@ +<news> +<date>May 26, 2017</date> +<title>Wine 2.9 Released</title> +<body> + The Wine development release 2.9 is now available. + <a href="{$root}/announce/2.9">What's new</a> in this release: +<ul> + <li>Support for tesselation shaders in Direct3D.</li> + <li>Binary mode support in WebServices.</li> + <li>Clipboard changes detected through Xfixes.</li> + <li>User interface improvements in RegEdit.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.9.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

André Hentschel : cryptnet: Fix CryptGetObjectUrl spec file entry.
by Alexandre Julliard 26 May '17

26 May '17

Module: wine Branch: master Commit: 9a4739810c18c9ba63fb44396e56933ac94a5c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4739810c18c9ba63fb44396… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 25 20:51:30 2017 +0200 cryptnet: Fix CryptGetObjectUrl spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptnet/cryptnet.spec b/dlls/cryptnet/cryptnet.spec index 6fca711..92d5c40 100644 --- a/dlls/cryptnet/cryptnet.spec +++ b/dlls/cryptnet/cryptnet.spec @@ -4,7 +4,7 @@ @ stub LdapProvOpenStore @ stub CryptCancelAsyncRetrieval @ stub CryptFlushTimeValidObject -@ stdcall CryptGetObjectUrl(ptr ptr long ptr ptr ptr ptr ptr) +@ stdcall CryptGetObjectUrl(str ptr long ptr ptr ptr ptr ptr) @ stub CryptGetTimeValidObject @ stub CryptInstallCancelRetrieval @ stdcall CryptRetrieveObjectByUrlA(str str long long ptr ptr ptr ptr ptr)

1 0

André Hentschel : wsdapi: Fix WSDXMLBuildAnyForSingleElement spec file entry.
by Alexandre Julliard 26 May '17

26 May '17

Module: wine Branch: master Commit: d50b3b3e5bb4fe5f40c36dcb522287698c171f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50b3b3e5bb4fe5f40c36dcb5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 25 20:51:32 2017 +0200 wsdapi: Fix WSDXMLBuildAnyForSingleElement spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/wsdapi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index fd89be7..7954ede 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -38,7 +38,7 @@ @ stub WSDUriEncode @ stdcall WSDXMLAddChild(ptr ptr) @ stdcall WSDXMLAddSibling(ptr ptr) -@ stdcall WSDXMLBuildAnyForSingleElement(ptr ptr ptr) +@ stdcall WSDXMLBuildAnyForSingleElement(ptr wstr ptr) @ stdcall WSDXMLCleanupElement(ptr) @ stdcall WSDXMLCreateContext(ptr) @ stub WSDXMLGetNameFromBuiltinNamespace

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 26 May '17

26 May '17

Module: wine Branch: master Commit: 3fef1e1cf6bceec8b93c9f3879a08adea88354fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fef1e1cf6bceec8b93c9f387… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri May 26 01:00:14 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 1e77cbc..bcf1254 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11758,11 +11758,8 @@ msgid "&About Registry Editor" msgstr "&Om Registerredigering" #: regedit.rc:91 regedit.rc:98 regedit.rc:229 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "utvidet" +msgstr "Utvid" #: regedit.rc:136 msgid "Modify Binary Data..." @@ -12245,11 +12242,8 @@ msgid "" msgstr "Vil du virkelig slette registernøkkel \"%1\" og alle dens undernøkler?" #: regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "kollapset" +msgstr "Kollaps" #: regsvr32.rc:32 msgid ""

1 0

Hugh McMaster : regedit/tests: Add tests for importing Windows 3.1 registry data.
by Alexandre Julliard 26 May '17

26 May '17

Module: wine Branch: master Commit: 51743827c97929933f1b1062265059a728de5636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51743827c97929933f1b10622… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 26 05:32:25 2017 +0000 regedit/tests: Add tests for importing Windows 3.1 registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 0bb10b7..d145f0b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -759,6 +759,55 @@ static void test_invalid_import(void) ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); } +static void test_invalid_import_31(void) +{ + HKEY hkey; + LONG lr; + + lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ, NULL, &hkey, NULL); + ok(lr == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", lr); + + /* Test character validity at the start of the line */ + exec_import_str("REGEDIT\r\n" + " HKEY_CLASSES_ROOT\\" KEY_BASE " = Value1a\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + " HKEY_CLASSES_ROOT\\" KEY_BASE " = Value1b\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + "\tHKEY_CLASSES_ROOT\\" KEY_BASE " = Value1c\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + ";HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2a\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + "#HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2b\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + /* Test case sensitivity */ + exec_import_str("REGEDIT\r\n" + "hkey_classes_root\\" KEY_BASE " = Value3a\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + "hKEY_CLASSES_ROOT\\" KEY_BASE " = Value3b\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + "Hkey_Classes_Root\\" KEY_BASE " = Value3c\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + RegCloseKey(hkey); + + lr = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); +} + static void test_comments(void) { LONG lr; @@ -1077,6 +1126,7 @@ START_TEST(regedit) test_basic_import(); test_basic_import_31(); test_invalid_import(); + test_invalid_import_31(); test_comments(); test_import_with_whitespace(); }

1 0