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

Austin English : d3dx9_27: Sort specfile.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 4bb77a8c0663c42198c9026190acc8b1908b771e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb77a8c0663c42198c902619… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:03 2017 -0500 d3dx9_27: 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_27/d3dx9_27.spec | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index 666a30c..7a28ca6 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.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) @@ -177,11 +177,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) @@ -251,6 +251,19 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(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) +@ stdcall D3DXSHEvalDirection(ptr long ptr) +@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) +@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) +@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float 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) @@ -268,19 +281,6 @@ @ 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) -@ stdcall D3DXSHEvalDirection(ptr long ptr) -@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) -@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) -@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float 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) -@ stdcall D3DXSHRotate(ptr long ptr ptr) -@ stdcall D3DXSHRotateZ(ptr long float ptr) -@ stdcall D3DXSHScale(ptr long ptr float) @ 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_29: Sort specfile.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 6f9ffae952515305659050f9403a934ad43cf1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9ffae952515305659050f94… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:05 2017 -0500 d3dx9_29: 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_29/d3dx9_29.spec | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index f7839d5..da49c9e 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.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) @@ -177,11 +177,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) @@ -256,6 +256,19 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(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) +@ stdcall D3DXSHEvalDirection(ptr long ptr) +@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) +@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) +@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float 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) @@ -273,19 +286,6 @@ @ 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) -@ stdcall D3DXSHEvalDirection(ptr long ptr) -@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) -@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) -@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float 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) -@ stdcall D3DXSHRotate(ptr long ptr ptr) -@ stdcall D3DXSHRotateZ(ptr long float ptr) -@ stdcall D3DXSHScale(ptr long ptr float) @ 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_25: Sort specfile.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: a282356b357e1555283cde6f862229913441c4b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a282356b357e1555283cde6f8… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:01 2017 -0500 d3dx9_25: 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_25/d3dx9_25.spec | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index f1637c9..9344e44 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -71,18 +71,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) @@ -117,6 +117,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) @@ -135,7 +136,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) @@ -173,11 +173,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) @@ -247,6 +247,19 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(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) +@ stdcall D3DXSHEvalDirection(ptr long ptr) +@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) +@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) +@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float 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) @@ -264,19 +277,6 @@ @ 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) -@ stdcall D3DXSHEvalDirection(ptr long ptr) -@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) -@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) -@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float 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) -@ stdcall D3DXSHRotate(ptr long ptr ptr) -@ stdcall D3DXSHRotateZ(ptr long float ptr) -@ stdcall D3DXSHScale(ptr long ptr float) @ 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_24: Sort specfile.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 37f1adc0eec5d71c177ad5f6d8c66db3a6e3c130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f1adc0eec5d71c177ad5f6d… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:00 2017 -0500 d3dx9_24: 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_24/d3dx9_24.spec | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index 5ae4332..b524fad 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -71,18 +71,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) @@ -117,6 +117,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) @@ -135,7 +136,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) @@ -173,11 +173,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) @@ -247,6 +247,19 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(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) +@ stdcall D3DXSHEvalDirection(ptr long ptr) +@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) +@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) +@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float 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) @@ -264,19 +277,6 @@ @ 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) -@ stdcall D3DXSHEvalDirection(ptr long ptr) -@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) -@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) -@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float 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) -@ stdcall D3DXSHRotate(ptr long ptr ptr) -@ stdcall D3DXSHRotateZ(ptr long float ptr) -@ stdcall D3DXSHScale(ptr long ptr float) @ 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

Francois Gouget : testbot/WineRunTask: Recognize skipped test units.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: tools Branch: master Commit: 3af65ac9a5223a9371ed5c397588351ba404c761 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3af65ac9a5223a9371ed5c39… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 24 23:56:37 2017 +0200 testbot/WineRunTask: Recognize skipped test units. In case we need to skip test units in the TestBot VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index f8e6977..12b83f2 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -564,14 +564,17 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) foreach my $Line (<$LogFile>) { - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) start (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) + if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) { - my ($Dll, $Unit) = ($1, $2); + my ($Dll, $Unit, $Type) = ($1, $2, $3); # Close the previous test unit CloseTestUnit(0) if ($CurrentDll ne ""); ($CurrentDll, $CurrentUnit) = ($Dll, $Unit); + + # Recognize skipped messages in case we need to skip tests in the VMs + $CurrentRc = 0 if ($Type eq "skipped"); } elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): / or ($CurrentUnit ne "" and

1 0

Francois Gouget : winetest: Add some structure to the scripts.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: tools Branch: master Commit: d6f48a63e689254fc870c29eb7ae7f21f4747a81 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d6f48a63e689254fc870c29e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 25 01:13:47 2017 +0200 winetest: Add some structure to the scripts. As far as the behavior is concerned this is a no-op. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-errors | 8 +++- winetest/build-index | 84 +++++++++++++++++++++++------------ winetest/dissect | 106 +++++++++++++++++++++++++++++++------------- winetest/gather | 120 ++++++++++++++++++++++++++++++++------------------ 4 files changed, 215 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=d6f48a63e689254fc870…

1 0

Austin English : kernel32: Add SetThreadIdealProcessorEx stub.
by Alexandre Julliard May 24, 2017

May 24, 2017

Module: wine Branch: master Commit: 980754bff773402efb52457b4536368900f3a1a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=980754bff773402efb52457b4… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 23:15:30 2017 -0500 kernel32: Add SetThreadIdealProcessorEx stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/thread.c | 9 +++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index e7e2c02..1496789 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -47,7 +47,7 @@ @ stub SetProcessMitigationPolicy @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext -@ stub SetThreadIdealProcessorEx +@ stdcall SetThreadIdealProcessorEx(long ptr ptr) kernel32.SetThreadIdealProcessorEx @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost @ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 968b960..c902274 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -53,7 +53,7 @@ @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext -@ stub SetThreadIdealProcessorEx +@ stdcall SetThreadIdealProcessorEx(long ptr ptr) kernel32.SetThreadIdealProcessorEx @ stub SetThreadInformation @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3260cdd..1a11af5 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1449,7 +1449,7 @@ @ stdcall SetThreadExecutionState(long) @ stdcall SetThreadGroupAffinity(long ptr ptr) @ stdcall SetThreadIdealProcessor(long long) -# @ stub SetThreadIdealProcessorEx +@ stdcall SetThreadIdealProcessorEx(long ptr ptr) @ stdcall SetThreadLocale(long) @ stdcall SetThreadPreferredUILanguages(long ptr ptr) @ stdcall SetThreadPriority(long long) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index de46618..ac2c368 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -471,6 +471,15 @@ DWORD WINAPI SetThreadIdealProcessor( return 0; } +/*********************************************************************** + * SetThreadIdealProcessorEx (KERNEL32.@) + */ +BOOL SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal, PROCESSOR_NUMBER *previous ) +{ + FIXME("(%p %p %p): stub\n", thread, ideal, previous); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} /*********************************************************************** * GetThreadSelectorEntry (KERNEL32.@) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 689d587..bb80f21 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1482,7 +1482,7 @@ @ stdcall SetThreadErrorMode(long ptr) kernel32.SetThreadErrorMode @ stdcall SetThreadGroupAffinity(long ptr ptr) kernel32.SetThreadGroupAffinity @ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor -# @ stub SetThreadIdealProcessorEx +@ stdcall SetThreadIdealProcessorEx(long ptr ptr) kernel32.SetThreadIdealProcessorEx # @ stub SetThreadInformation @ stdcall SetThreadLocale(long) kernel32.SetThreadLocale @ stdcall SetThreadPreferredUILanguages(long ptr ptr) kernel32.SetThreadPreferredUILanguages

1 0

Austin English : kernel32: Add GetActiveProcessorCount stub.
by Alexandre Julliard May 24, 2017

May 24, 2017

Module: wine Branch: master Commit: 66b37c556c4e1aa6531a556786e8d4b1acfa13d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b37c556c4e1aa6531a55678… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 23:15:29 2017 -0500 kernel32: Add GetActiveProcessorCount stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 15 +++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index bccbfa9..2e0e79f 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -312,3 +312,18 @@ WORD WINAPI GetActiveProcessorGroupCount(void) FIXME("semi-stub, always returning 1\n"); return 1; } + +/*********************************************************************** + * GetActiveProcessorCount (KERNEL32.@) + */ +DWORD WINAPI GetActiveProcessorCount(WORD group) +{ + SYSTEM_INFO si; + DWORD cpus; + + GetSystemInfo( &si ); + cpus = si.dwNumberOfProcessors; + + FIXME("semi-stub, returning %u\n", cpus); + return cpus; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 997e47a..3260cdd 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -540,7 +540,7 @@ @ stdcall GenerateConsoleCtrlEvent(long long) @ stdcall -i386 -private Get16DLLAddress(long str) krnl386.exe16.Get16DLLAddress @ stdcall GetACP() -# @ stub GetActiveProcessorCount +@ stdcall GetActiveProcessorCount(long) @ stdcall GetActiveProcessorGroupCount() # @ stub GetApplicationRecoveryCallback # @ stub GetApplicationRestartSettings

1 0

Nikolay Sivov : comctl32/taskdialog: Display content text label.
by Alexandre Julliard May 24, 2017

May 24, 2017

Module: wine Branch: master Commit: 8967e87c8a890aed7a81051c2d372f065e825bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8967e87c8a890aed7a81051c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 24 20:43:25 2017 +0300 comctl32/taskdialog: Display content text label. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index e452d34..fcc7db7 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -47,6 +47,7 @@ static const UINT DIALOG_BUTTON_WIDTH = 50; static const UINT DIALOG_BUTTON_HEIGHT = 14; static const UINT ID_MAIN_INSTRUCTION = 0xf000; +static const UINT ID_CONTENT = 0xf001; struct taskdialog_control { @@ -134,7 +135,7 @@ static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc return ALIGNED_LENGTH(size, 3); } -static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_desc *desc) +static unsigned int taskdialog_add_static_label(struct taskdialog_template_desc *desc, WORD id, const WCHAR *str) { RECT rect = { 0, 0, desc->dialog_width - DIALOG_SPACING * 2, 0}; /* padding left and right of the control */ const WCHAR *textW = NULL; @@ -142,21 +143,20 @@ static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_d HFONT oldfont; HDC hdc; - if (!desc->taskconfig->pszMainInstruction) + if (!str) return 0; - if (IS_INTRESOURCE(desc->taskconfig->pszMainInstruction)) + if (IS_INTRESOURCE(str)) { - if (!(length = LoadStringW(desc->taskconfig->hInstance, (UINT_PTR)desc->taskconfig->pszMainInstruction, - (WCHAR *)&textW, 0))) + if (!(length = LoadStringW(desc->taskconfig->hInstance, (UINT_PTR)str, (WCHAR *)&textW, 0))) { - WARN("Failed to load main instruction text\n"); + WARN("Failed to load static text %s, id %#x\n", debugstr_w(str), id); return 0; } } else { - textW = desc->taskconfig->pszMainInstruction; + textW = str; length = strlenW(textW); } @@ -170,13 +170,23 @@ static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_d SelectObject(hdc, oldfont); ReleaseDC(0, hdc); - size = taskdialog_add_control(desc, ID_MAIN_INSTRUCTION, WC_STATICW, desc->taskconfig->hInstance, - desc->taskconfig->pszMainInstruction, DIALOG_SPACING, desc->dialog_height, - rect.right, rect.bottom); + desc->dialog_height += DIALOG_SPACING; + size = taskdialog_add_control(desc, id, WC_STATICW, desc->taskconfig->hInstance, str, DIALOG_SPACING, + desc->dialog_height, rect.right, rect.bottom); desc->dialog_height += rect.bottom; return size; } +static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_desc *desc) +{ + return taskdialog_add_static_label(desc, ID_MAIN_INSTRUCTION, desc->taskconfig->pszMainInstruction); +} + +static unsigned int taskdialog_add_content(struct taskdialog_template_desc *desc) +{ + return taskdialog_add_static_label(desc, ID_CONTENT, desc->taskconfig->pszContent); +} + static unsigned int taskdialog_add_common_buttons(struct taskdialog_template_desc *desc) { short button_x = desc->dialog_width - DIALOG_BUTTON_WIDTH - DIALOG_SPACING; @@ -289,11 +299,12 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi screen_width = taskdialog_get_reference_rect(&desc, &ref_rect); - desc.dialog_height = DIALOG_SPACING; + desc.dialog_height = 0; desc.dialog_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH); desc.dialog_width = min(desc.dialog_width, screen_width); size += taskdialog_add_main_instruction(&desc); + size += taskdialog_add_content(&desc); size += taskdialog_add_common_buttons(&desc); template = Alloc(size);

1 0

Austin English : kernel32: Add GetActiveProcessorGroupCount stub.
by Alexandre Julliard May 24, 2017

May 24, 2017

Module: wine Branch: master Commit: 360e9544bf8346ca1279311306303ecc0ac8ac79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=360e9544bf8346ca127931130… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 23:15:28 2017 -0500 kernel32: Add GetActiveProcessorGroupCount stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 9 +++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 756d8f9..bccbfa9 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -303,3 +303,12 @@ SIZE_T WINAPI GetLargePageMinimum(void) FIXME("Not implemented on your platform/architecture.\n"); return 0; } + +/*********************************************************************** + * GetActiveProcessorGroupCount (KERNEL32.@) + */ +WORD WINAPI GetActiveProcessorGroupCount(void) +{ + FIXME("semi-stub, always returning 1\n"); + return 1; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5ef7cb8..997e47a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -541,7 +541,7 @@ @ stdcall -i386 -private Get16DLLAddress(long str) krnl386.exe16.Get16DLLAddress @ stdcall GetACP() # @ stub GetActiveProcessorCount -# @ stub GetActiveProcessorGroupCount +@ stdcall GetActiveProcessorGroupCount() # @ stub GetApplicationRecoveryCallback # @ stub GetApplicationRestartSettings @ stdcall GetAtomNameA(long ptr long)

1 0