Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49891: [CMAKE] - Link wine dx, that do forwards to the respective import libs (MSVC requires that) - add import lib for d3dx9_24 - add IID_IUnknown to d3dx9_36_main.c for MSVC
by tkreuzer＠svn.reactos.org 02 Dec '10

02 Dec '10

Author: tkreuzer Date: Thu Dec 2 11:49:15 2010 New Revision: 49891 URL: http://svn.reactos.org/svn/reactos?rev=49891&view=rev Log: [CMAKE] - Link wine dx, that do forwards to the respective import libs (MSVC requires that) - add import lib for d3dx9_24 - add IID_IUnknown to d3dx9_36_main.c for MSVC Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36_main.c Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt [iso-8859-1] Thu Dec 2 11:49:15 2010 @@ -31,3 +31,4 @@ add_dependencies(d3dx9_24 wineheaders) add_cab_target(d3dx9_24 1) +add_importlib_target(d3dx9_24.spec libd3dx9_36) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt [iso-8859-1] Thu Dec 2 11:49:15 2010 @@ -20,6 +20,7 @@ add_importlibs(d3dx9_25 d3dx9_36 + d3dx9_24 d3d9 user32 gdi32 @@ -31,4 +32,4 @@ add_dependencies(d3dx9_25 wineheaders) add_cab_target(d3dx9_25 1) -add_importlib_target(d3dx9_25.spec libd3dx9_36) +add_importlib_target(d3dx9_25.spec libd3dx9_24 libd3dx9_36) Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt [iso-8859-1] Thu Dec 2 11:49:15 2010 @@ -21,6 +21,7 @@ add_importlibs(d3dx9_26 d3d9 d3dx9_36 + d3dx9_24 user32 gdi32 advapi32 Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt [iso-8859-1] Thu Dec 2 11:49:15 2010 @@ -20,6 +20,7 @@ add_importlibs(d3dx9_27 d3d9 + d3dx9_24 d3dx9_36 user32 gdi32 Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt [iso-8859-1] Thu Dec 2 11:49:15 2010 @@ -20,6 +20,7 @@ add_importlibs(d3dx9_28 d3d9 + d3dx9_24 d3dx9_36 user32 gdi32 Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt [iso-8859-1] Thu Dec 2 11:49:15 2010 @@ -20,6 +20,7 @@ add_importlibs(d3dx9_29 d3d9 + d3dx9_24 d3dx9_36 user32 gdi32 Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt [iso-8859-1] Thu Dec 2 11:49:15 2010 @@ -20,6 +20,7 @@ add_importlibs(d3dx9_30 d3d9 + d3dx9_24 d3dx9_36 user32 gdi32 Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36_main.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36_main.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36_main.c [iso-8859-1] Thu Dec 2 11:49:15 2010 @@ -32,6 +32,10 @@ #include "winuser.h" #include "d3dx9.h" + +#ifdef _MSC_VER +DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); +#endif /*********************************************************************** * DllMain.

1 0

[tkreuzer] 49890: [CMAKE] add libd3dx9_24.a
by tkreuzer＠svn.reactos.org 02 Dec '10

02 Dec '10

Author: tkreuzer Date: Thu Dec 2 11:45:24 2010 New Revision: 49890 URL: http://svn.reactos.org/svn/reactos?rev=49890&view=rev Log: [CMAKE] add libd3dx9_24.a Added: branches/cmake-bringup/importlibs/libd3dx9_24.a (with props) Added: branches/cmake-bringup/importlibs/libd3dx9_24.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libd3d… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libd3dx9_24.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[tkreuzer] 49889: [CMAKE] Generate proper stdcall stubs for d3dx9_24 and d3dx9_36 Fix D3DXLoadSurfaceFromSurface parameters
by tkreuzer＠svn.reactos.org 02 Dec '10

02 Dec '10

Author: tkreuzer Date: Thu Dec 2 11:44:24 2010 New Revision: 49889 URL: http://svn.reactos.org/svn/reactos?rev=49889&view=rev Log: [CMAKE] Generate proper stdcall stubs for d3dx9_24 and d3dx9_36 Fix D3DXLoadSurfaceFromSurface parameters Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_24/d3dx9_24.spec branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36.spec Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_24/d3dx9_24.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_24/d3dx9_24.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_24/d3dx9_24.spec [iso-8859-1] Thu Dec 2 11:44:24 2010 @@ -26,7 +26,7 @@ @ stdcall D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXConcatenateMeshes @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToSingleStrip @ stdcall D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToStrips -@ stub D3DXCpuOptimizations +@ stdcall -stub D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) d3dx9_36.D3DXCreateAnimationController @ stdcall D3DXCreateBox(ptr long long long ptr ptr) d3dx9_36.D3DXCreateBox @ stdcall D3DXCreateBuffer(long ptr) d3dx9_36.D3DXCreateBuffer @@ -159,8 +159,8 @@ @ stdcall D3DXGetShaderSamplers(ptr ptr ptr) d3dx9_36.D3DXGetShaderSamplers @ stdcall D3DXGetShaderSize(ptr) d3dx9_36.D3DXGetShaderSize @ stdcall D3DXGetShaderVersion(ptr) d3dx9_36.D3DXGetShaderVersion -@ stub D3DXGetTargetDescByName -@ stub D3DXGetTargetDescByVersion +@ stdcall -stub D3DXGetTargetDescByName(long long long) +@ stdcall -stub D3DXGetTargetDescByVersion(long long long) @ stdcall D3DXGetVertexShaderProfile(ptr) d3dx9_36.D3DXGetVertexShaderProfile @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXIntersect @ stdcall D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXIntersectSubset @@ -185,7 +185,7 @@ @ stdcall D3DXLoadSurfaceFromMemory(ptr ptr ptr ptr long long ptr ptr long long) d3dx9_36.D3DXLoadSurfaceFromMemory @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr long ptr ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromResourceA @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr long ptr ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromResourceW -@ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long) d3dx9_36.D3DXLoadSurfaceFromSurface +@ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXLoadSurfaceFromSurface @ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXLoadVolumeFromFileA @ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadVolumeFromFileInMemory @ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXLoadVolumeFromFileW Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36.spec [iso-8859-1] Thu Dec 2 11:44:24 2010 @@ -4,150 +4,150 @@ @ stdcall D3DXAssembleShaderFromResourceA(long str ptr ptr long ptr ptr) @ stdcall D3DXAssembleShaderFromResourceW(long wstr ptr ptr long ptr ptr) @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) -@ stub D3DXCheckCubeTextureRequirements -@ stub D3DXCheckTextureRequirements +@ stdcall -stub D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) +@ stdcall -stub D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) @ stdcall D3DXCheckVersion(long long) -@ stub D3DXCheckVolumeTextureRequirements -@ stub D3DXCleanMesh +@ stdcall -stub D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) +@ stdcall -stub D3DXCleanMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXColorAdjustContrast(ptr ptr long) @ stdcall D3DXColorAdjustSaturation(ptr ptr long) @ stdcall D3DXCompileShader(ptr long ptr ptr ptr ptr long ptr ptr ptr) -@ stub D3DXCompileShaderFromFileA -@ stub D3DXCompileShaderFromFileW -@ stub D3DXCompileShaderFromResourceA -@ stub D3DXCompileShaderFromResourceW +@ stdcall -stub D3DXCompileShaderFromFileA(ptr ptr ptr ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCompileShaderFromFileW(ptr ptr ptr ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCompileShaderFromResourceA(long ptr ptr ptr ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCompileShaderFromResourceW(long ptr ptr ptr ptr ptr long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) @ stub D3DXComputeIMTFromPerTexelSignal @ stub D3DXComputeIMTFromPerVertexSignal @ stub D3DXComputeIMTFromSignal @ stub D3DXComputeIMTFromTexture -@ stub D3DXComputeNormalMap -@ stub D3DXComputeNormals -@ stub D3DXComputeTangent -@ stub D3DXComputeTangentFrame -@ stub D3DXComputeTangentFrameEx -@ stub D3DXConcatenateMeshes -@ stub D3DXConvertMeshSubsetToSingleStrip -@ stub D3DXConvertMeshSubsetToStrips -@ stub D3DXCreateAnimationController -@ stub D3DXCreateBox +@ stdcall -stub D3DXComputeNormalMap(ptr ptr ptr long long long) +@ stdcall -stub D3DXComputeNormals(ptr ptr) +@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall -stub D3DXComputeTangentFrame(ptr long) +@ stdcall -stub D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr long long long ptr ptr) +@ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) +@ stdcall -stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) +@ stdcall -stub D3DXCreateAnimationController(long long long long ptr) +@ stdcall -stub D3DXCreateBox(ptr long long long ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) -@ stub D3DXCreateCompressedAnimationSet -@ stub D3DXCreateCubeTexture -@ stub D3DXCreateCubeTextureFromFileA -@ stub D3DXCreateCubeTextureFromFileExA -@ stub D3DXCreateCubeTextureFromFileExW -@ stub D3DXCreateCubeTextureFromFileInMemory -@ stub D3DXCreateCubeTextureFromFileInMemoryEx -@ stub D3DXCreateCubeTextureFromFileW -@ stub D3DXCreateCubeTextureFromResourceA -@ stub D3DXCreateCubeTextureFromResourceExA -@ stub D3DXCreateCubeTextureFromResourceExW -@ stub D3DXCreateCubeTextureFromResourceW -@ stub D3DXCreateCylinder -@ stub D3DXCreateEffect -@ stub D3DXCreateEffectCompiler -@ stub D3DXCreateEffectCompilerFromFileA -@ stub D3DXCreateEffectCompilerFromFileW -@ stub D3DXCreateEffectCompilerFromResourceA -@ stub D3DXCreateEffectCompilerFromResourceW -@ stub D3DXCreateEffectEx -@ stub D3DXCreateEffectFromFileA -@ stub D3DXCreateEffectFromFileExA -@ stub D3DXCreateEffectFromFileExW -@ stub D3DXCreateEffectFromFileW -@ stub D3DXCreateEffectFromResourceA -@ stub D3DXCreateEffectFromResourceExA -@ stub D3DXCreateEffectFromResourceExW -@ stub D3DXCreateEffectFromResourceW -@ stub D3DXCreateEffectPool +@ stdcall -stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) +@ stdcall -stub D3DXCreateCubeTexture(ptr long long long long long ptr) +@ stdcall -stub D3DXCreateCubeTextureFromFileA(ptr ptr ptr) +@ stdcall -stub D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) +@ stdcall -stub D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateCubeTextureFromFileW(ptr ptr ptr) +@ stdcall -stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromResourceA +@ stdcall -stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) +@ stdcall -stub D3DXCreateCylinder(ptr long long long long long ptr ptr) +@ stdcall -stub D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) +@ stdcall -stub D3DXCreateEffectCompilerFromFileA(ptr ptr ptr long ptr ptr) +@ stdcall -stub D3DXCreateEffectCompilerFromFileW(ptr ptr ptr long ptr ptr) +@ stdcall -stub D3DXCreateEffectCompilerFromResourceA(long ptr ptr ptr long ptr ptr) +@ stdcall -stub D3DXCreateEffectCompilerFromResourceW(long ptr ptr ptr long ptr ptr) +@ stdcall -stub D3DXCreateEffectEx(ptr ptr long ptr ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCreateEffectFromFileA(ptr ptr ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCreateEffectFromFileExA(ptr ptr ptr ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCreateEffectFromFileExW(ptr ptr ptr ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCreateEffectFromFileW(ptr ptr ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCreateEffectFromResourceA(ptr long ptr ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCreateEffectFromResourceExA(ptr long ptr ptr ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCreateEffectFromResourceExW(ptr long ptr ptr ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCreateEffectFromResourceW(ptr long ptr ptr ptr long ptr ptr ptr) +@ stdcall -stub D3DXCreateEffectPool(ptr) @ stdcall D3DXCreateFontA(ptr long long long long long long long long long str ptr) @ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) -@ stub D3DXCreateFragmentLinker +@ stdcall -stub D3DXCreateFragmentLinker(ptr long ptr) @ stub D3DXCreateFragmentLinkerEx -@ stub D3DXCreateKeyframedAnimationSet -@ stub D3DXCreateLine +@ stdcall -stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall -stub D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) -@ stub D3DXCreateMesh -@ stub D3DXCreateMeshFVF -@ stub D3DXCreateNPatchMesh -@ stub D3DXCreatePMeshFromStream -@ stub D3DXCreatePatchMesh -@ stub D3DXCreatePolygon -@ stub D3DXCreatePRTBuffer -@ stub D3DXCreatePRTBufferTex -@ stub D3DXCreatePRTCompBuffer -@ stub D3DXCreatePRTEngine -@ stub D3DXCreateRenderToEnvMap -@ stub D3DXCreateRenderToSurface -@ stub D3DXCreateSPMesh -@ stub D3DXCreateSkinInfo -@ stub D3DXCreateSkinInfoFromBlendedMesh -@ stub D3DXCreateSkinInfoFVF -@ stub D3DXCreateSphere +@ stdcall -stub D3DXCreateMesh(long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateMeshFVF(long long long long ptr ptr) +@ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) +@ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall -stub D3DXCreatePolygon(ptr long long ptr ptr) +@ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) +@ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) +@ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) +@ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stdcall -stub D3DXCreateRenderToEnvMap(ptr long long long long long ptr) +@ stdcall -stub D3DXCreateRenderToSurface(ptr long long long long long ptr) +@ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXCreateSkinInfo(long ptr long ptr) +@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) +@ stdcall -stub D3DXCreateSkinInfoFVF(long long long ptr) +@ stdcall -stub D3DXCreateSphere(ptr long long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) -@ stub D3DXCreateTeapot -@ stub D3DXCreateTextA -@ stub D3DXCreateTextW -@ stdcall D3DXCreateTexture(ptr long long long long long long ptr) -@ stub D3DXCreateTextureFromFileA -@ stub D3DXCreateTextureFromFileExA -@ stub D3DXCreateTextureFromFileExW -@ stub D3DXCreateTextureFromFileInMemory -@ stub D3DXCreateTextureFromFileInMemoryEx -@ stub D3DXCreateTextureFromFileW -@ stub D3DXCreateTextureFromResourceA -@ stub D3DXCreateTextureFromResourceExA -@ stub D3DXCreateTextureFromResourceExW -@ stub D3DXCreateTextureFromResourceW -@ stub D3DXCreateTextureGutterHelper -@ stub D3DXCreateTextureShader -@ stub D3DXCreateTorus -@ stub D3DXCreateVolumeTexture -@ stub D3DXCreateVolumeTextureFromFileA -@ stub D3DXCreateVolumeTextureFromFileExA -@ stub D3DXCreateVolumeTextureFromFileExW -@ stub D3DXCreateVolumeTextureFromFileInMemory -@ stub D3DXCreateVolumeTextureFromFileInMemoryEx -@ stub D3DXCreateVolumeTextureFromFileW -@ stub D3DXCreateVolumeTextureFromResourceA -@ stub D3DXCreateVolumeTextureFromResourceExA -@ stub D3DXCreateVolumeTextureFromResourceExW -@ stub D3DXCreateVolumeTextureFromResourceW +@ stdcall -stub D3DXCreateTeapot(ptr ptr ptr) +@ stdcall -stub D3DXCreateTextA(ptr long ptr long long ptr ptr ptr) +@ stdcall -stub D3DXCreateTextW(ptr long ptr long long ptr ptr ptr) +@ stdcall -stub D3DXCreateTexture(ptr long long long long long long ptr) +@ stdcall -stub D3DXCreateTextureFromFileA(ptr ptr ptr) +@ stdcall -stub D3DXCreateTextureFromFileExA(ptr ptr long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateTextureFromFileExW(ptr ptr long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateTextureFromFileInMemory(ptr ptr long ptr) +@ stdcall -stub D3DXCreateTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateTextureFromFileW(ptr ptr ptr) +@ stdcall -stub D3DXCreateTextureFromResourceA(ptr long ptr ptr) +@ stdcall -stub D3DXCreateTextureFromResourceExA(ptr long ptr long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateTextureFromResourceExW(ptr long ptr long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateTextureFromResourceW(ptr long ptr ptr) +@ stdcall -stub D3DXCreateTextureGutterHelper(long long ptr long ptr) +@ stdcall -stub D3DXCreateTextureShader(ptr ptr) +@ stdcall -stub D3DXCreateTorus(ptr long long long long ptr ptr) +@ stdcall -stub D3DXCreateVolumeTexture(ptr long long long long long long long ptr) +@ stdcall -stub D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) +@ stdcall -stub D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) +@ stdcall -stub D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall -stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) +@ stdcall -stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall -stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) -@ stub D3DXDeclaratorFromFVF -@ stub D3DXDisassembleEffect -@ stub D3DXDisassembleShader -@ stub D3DXFileCreate -@ stub D3DXFillCubeTexture -@ stub D3DXFillCubeTextureTX -@ stub D3DXFillTexture -@ stub D3DXFillTextureTX -@ stub D3DXFillVolumeTexture -@ stub D3DXFillVolumeTextureTX -@ stub D3DXFilterTexture +@ stdcall -stub D3DXDeclaratorFromFVF(long ptr) +@ stdcall -stub D3DXDisassembleEffect(ptr long ptr) +@ stdcall -stub D3DXDisassembleShader(ptr long ptr ptr) +@ stdcall -stub D3DXFileCreate(ptr) +@ stdcall -stub D3DXFillCubeTexture(ptr ptr ptr) +@ stdcall -stub D3DXFillCubeTextureTX(ptr ptr)TX +@ stdcall -stub D3DXFillTexture(ptr ptr ptr) +@ stdcall -stub D3DXFillTextureTX(ptr ptr) +@ stdcall -stub D3DXFillVolumeTexture(ptr ptr ptr) +@ stdcall -stub D3DXFillVolumeTextureTX(ptr ptr) +@ stdcall -stub D3DXFilterTexture(ptr ptr long long) @ stdcall D3DXFindShaderComment(ptr long ptr ptr) -@ stub D3DXFloat16To32Array -@ stub D3DXFloat32To16Array -@ stub D3DXFrameAppendChild -@ stub D3DXFrameCalculateBoundingSphere -@ stub D3DXFrameDestroy -@ stub D3DXFrameFind -@ stub D3DXFrameNumNamedMatrices -@ stub D3DXFrameRegisterNamedMatrices +@ stdcall -stub D3DXFloat16To32Array(ptr ptr long) +@ stdcall -stub D3DXFloat32To16Array(ptr ptr long) +@ stdcall -stub D3DXFrameAppendChild(ptr ptr) +@ stdcall -stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) +@ stdcall -stub D3DXFrameDestroy(ptr ptr) +@ stdcall -stub D3DXFrameFind(ptr ptr) +@ stdcall -stub D3DXFrameNumNamedMatrices(ptr) +@ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(long long) -@ stub D3DXFVFFromDeclarator -@ stub D3DXGatherFragments -@ stub D3DXGatherFragmentsFromFileA -@ stub D3DXGatherFragmentsFromFileW -@ stub D3DXGatherFragmentsFromResourceA -@ stub D3DXGatherFragmentsFromResourceW -@ stub D3DXGenerateOutputDecl -@ stub D3DXGeneratePMesh -@ stub D3DXGetDeclLength +@ stdcall -stub D3DXFVFFromDeclarator(ptr ptr) +@ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) +@ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) +@ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) +@ stdcall -stub D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) +@ stdcall -stub D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) +@ stdcall -stub D3DXGenerateOutputDecl(ptr ptr) +@ stdcall -stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) +@ stdcall -stub D3DXGetDeclLength(ptr) @ stdcall D3DXGetDeclVertexSize(ptr long) @ stdcall D3DXGetDriverLevel(ptr) @ stdcall D3DXGetFVFVertexSize(long) @@ -159,29 +159,29 @@ @ stdcall D3DXGetPixelShaderProfile(ptr) @ stdcall D3DXGetShaderConstantTable(ptr ptr) @ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) -@ stub D3DXGetShaderInputSemantics -@ stub D3DXGetShaderOutputSemantics -@ stub D3DXGetShaderSamplers +@ stdcall -stub D3DXGetShaderInputSemantics(ptr ptr ptr) +@ stdcall -stub D3DXGetShaderOutputSemantics(ptr ptr ptr) +@ stdcall -stub D3DXGetShaderSamplers(ptr ptr ptr) @ stdcall D3DXGetShaderSize(ptr) @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) -@ stub D3DXIntersect -@ stub D3DXIntersectSubset +@ stdcall -stub D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) -@ stub D3DXLoadMeshFromXA -@ stub D3DXLoadMeshFromXInMemory -@ stub D3DXLoadMeshFromXResource -@ stub D3DXLoadMeshFromXW -@ stub D3DXLoadMeshFromXof -@ stub D3DXLoadMeshHierarchyFromXA -@ stub D3DXLoadMeshHierarchyFromXInMemory -@ stub D3DXLoadMeshHierarchyFromXW -@ stub D3DXLoadPatchMeshFromXof -@ stub D3DXLoadPRTBufferFromFileA -@ stub D3DXLoadPRTBufferFromFileW -@ stub D3DXLoadPRTCompBufferFromFileA -@ stub D3DXLoadPRTCompBufferFromFileW -@ stub D3DXLoadSkinMeshFromXof +@ stdcall -stub D3DXLoadMeshFromXA(ptr long ptr ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXLoadMeshFromXResource(long ptr ptr long ptr ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXLoadMeshFromXW(ptr long ptr ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXLoadMeshHierarchyFromXA(ptr long ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXLoadMeshHierarchyFromXW(ptr long ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) +@ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) +@ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) +@ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) +@ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stdcall -stub 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) @ stdcall D3DXLoadSurfaceFromFileW(ptr ptr ptr wstr ptr long long ptr) @@ -189,13 +189,13 @@ @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) -@ stub D3DXLoadVolumeFromFileA -@ stub D3DXLoadVolumeFromFileInMemory -@ stub D3DXLoadVolumeFromFileW -@ stub D3DXLoadVolumeFromMemory -@ stub D3DXLoadVolumeFromResourceA -@ stub D3DXLoadVolumeFromResourceW -@ stub D3DXLoadVolumeFromVolume +@ stdcall -stub D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) +@ stdcall -stub D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) +@ stdcall -stub D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) +@ stdcall -stub D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) +@ stdcall -stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) +@ stdcall -stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) +@ stdcall -stub D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr long ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr long ptr long ptr) @ stdcall D3DXMatrixDecompose(ptr ptr ptr ptr) @@ -228,8 +228,8 @@ @ stdcall D3DXMatrixTransformation2D(ptr ptr long ptr ptr long ptr) @ stdcall D3DXMatrixTranslation(ptr long long long) @ stdcall D3DXMatrixTranspose(ptr ptr) -@ stub D3DXOptimizeFaces -@ stub D3DXOptimizeVertices +@ stdcall -stub D3DXOptimizeFaces(ptr long long long ptr) +@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -252,56 +252,56 @@ @ stdcall D3DXQuaternionRotationYawPitchRoll(ptr long long long) @ stdcall D3DXQuaternionSlerp(ptr ptr ptr long) @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr long) -@ stub D3DXQuaternionSquadSetup +@ stdcall -stub D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) -@ stub D3DXRectPatchSize -@ stub D3DXSaveMeshHierarchyToFileA -@ stub D3DXSaveMeshHierarchyToFileW -@ stub D3DXSaveMeshToXA -@ stub D3DXSaveMeshToXW -@ stub D3DXSavePRTBufferToFileA -@ stub D3DXSavePRTBufferToFileW -@ stub D3DXSavePRTCompBufferToFileA -@ stub D3DXSavePRTCompBufferToFileW -@ stub D3DXSaveSurfaceToFileA -@ stub D3DXSaveSurfaceToFileInMemory -@ stub D3DXSaveSurfaceToFileW -@ stub D3DXSaveTextureToFileA -@ stub D3DXSaveTextureToFileInMemory -@ stub D3DXSaveTextureToFileW -@ stub D3DXSaveVolumeToFileA -@ stub D3DXSaveVolumeToFileInMemory -@ stub D3DXSaveVolumeToFileW -@ stub D3DXSHAdd -@ stub D3DXSHDot -@ stub D3DXSHEvalConeLight -@ stub D3DXSHEvalDirection -@ stub D3DXSHEvalDirectionalLight -@ stub D3DXSHEvalHemisphereLight -@ stub D3DXSHEvalSphericalLight +@ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) +@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall -stub D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall -stub D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall -stub D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall -stub D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall -stub D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall -stub D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) +@ stdcall -stub D3DXSHAdd(ptr long ptr ptr) +@ stdcall -stub D3DXSHDot(long ptr ptr) +@ stdcall -stub D3DXSHEvalConeLight(long ptr long long long long ptr ptr ptr) +@ stdcall -stub D3DXSHEvalDirection(ptr long ptr) +@ stdcall -stub D3DXSHEvalDirectionalLight(long ptr long long long long ptr ptr ptr) +@ stdcall -stub D3DXSHEvalHemisphereLight(long ptr long long ptr ptr ptr) +@ stdcall -stub D3DXSHEvalSphericalLight(long ptr long long long long ptr ptr ptr) @ stub D3DXSHMultiply2 @ stub D3DXSHMultiply3 @ stub D3DXSHMultiply4 @ stub D3DXSHMultiply5 @ stub D3DXSHMultiply6 -@ stub D3DXSHProjectCubeMap -@ stub D3DXSHPRTCompSplitMeshSC -@ stub D3DXSHPRTCompSuperCluster -@ stub D3DXSHRotate -@ stub D3DXSHRotateZ -@ stub D3DXSHScale -@ stub D3DXSimplifyMesh +@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stdcall -stub D3DXSHRotate(ptr long ptr ptr) +@ stdcall -stub D3DXSHRotateZ(ptr long long ptr) +@ stdcall -stub D3DXSHScale(ptr long ptr ptr) +@ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr long ptr ptr) -@ stub D3DXSplitMesh -@ stub D3DXTessellateNPatches -@ stub D3DXTessellateRectPatch -@ stub D3DXTessellateTriPatch -@ stub D3DXTriPatchSize +@ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXTessellateNPatches(ptr ptr long long ptr ptr) +@ stdcall -stub D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) +@ stdcall -stub D3DXTriPatchSize(ptr ptr ptr) @ stub D3DXUVAtlasCreate @ stub D3DXUVAtlasPack @ stub D3DXUVAtlasPartition -@ stub D3DXValidMesh -@ stub D3DXValidPatchMesh +@ stdcall -stub D3DXValidMesh(ptr ptr ptr) +@ stdcall -stub D3DXValidPatchMesh(ptr ptr ptr ptr) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr long) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr long) @@ -333,4 +333,4 @@ @ stdcall D3DXVec4Normalize(ptr ptr) @ stdcall D3DXVec4Transform(ptr ptr ptr) @ stdcall D3DXVec4TransformArray(ptr long ptr long ptr long) -@ stub D3DXWeldVertices +@ stdcall -stub D3DXWeldVertices(ptr long ptr ptr ptr ptr ptr)

1 0

[tkreuzer] 49888: [CMAKE] Convert __wine_spec_unimplemented_stub to a macro
by tkreuzer＠svn.reactos.org 01 Dec '10

01 Dec '10

Author: tkreuzer Date: Wed Dec 1 21:39:38 2010 New Revision: 49888 URL: http://svn.reactos.org/svn/reactos?rev=49888&view=rev Log: [CMAKE] Convert __wine_spec_unimplemented_stub to a macro Modified: branches/cmake-bringup/include/reactos/stubs.h Modified: branches/cmake-bringup/include/reactos/stubs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/s… ============================================================================== --- branches/cmake-bringup/include/reactos/stubs.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/stubs.h [iso-8859-1] Wed Dec 1 21:39:38 2010 @@ -7,11 +7,10 @@ #include <debug.h> -void __wine_spec_unimplemented_stub(const char *module, const char *function ) -{ - ULONG_PTR args[2]; - - args[0] = (ULONG_PTR)module; - args[1] = (ULONG_PTR)function; - RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); +#define __wine_spec_unimplemented_stub(module, function) \ +{ \ + ULONG_PTR args[2]; \ + args[0] = (ULONG_PTR)module; \ + args[1] = (ULONG_PTR)function; \ + RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); \ }

1 0

[tkreuzer] 49887: [CMAKE] Manual stubs for comctl32
by tkreuzer＠svn.reactos.org 01 Dec '10

01 Dec '10

Author: tkreuzer Date: Wed Dec 1 21:16:25 2010 New Revision: 49887 URL: http://svn.reactos.org/svn/reactos?rev=49887&view=rev Log: [CMAKE] Manual stubs for comctl32 Added: branches/cmake-bringup/dll/win32/comctl32/stubs.c (with props) Modified: branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt branches/cmake-bringup/dll/win32/comctl32/comctl32.spec Modified: branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl3… ============================================================================== --- branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Wed Dec 1 21:16:25 2010 @@ -47,6 +47,7 @@ trackbar.c treeview.c updown.c + stubs.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def) Modified: branches/cmake-bringup/dll/win32/comctl32/comctl32.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl3… ============================================================================== --- branches/cmake-bringup/dll/win32/comctl32/comctl32.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comctl32/comctl32.spec [iso-8859-1] Wed Dec 1 21:16:25 2010 @@ -30,8 +30,8 @@ 155 stdcall -noname FindMRUStringA(long str ptr) 156 stdcall -noname DelMRUString(long long) 157 stdcall -noname CreateMRUListLazyA(ptr long long long) -163 stub -noname CreatePage -164 stub -noname CreateProxyPage +163 stdcall -noname CreatePage(long ptr) +164 stdcall -noname CreateProxyPage(long long) 167 stdcall -noname AddMRUData(long ptr long) 169 stdcall -noname FindMRUData(long ptr long ptr) 233 stdcall -noname Str_GetPtrA(str str long) @@ -88,13 +88,13 @@ 376 stdcall -noname IntlStrEqWorkerA(long str str long) 377 stdcall -noname IntlStrEqWorkerW(long wstr wstr long) 382 stdcall -noname SmoothScrollWindow(ptr) -383 stub -noname DoReaderMode +383 stdcall -noname DoReaderMode(ptr) 384 stdcall -noname SetPathWordBreakProc(ptr long) 385 stdcall -noname DPA_EnumCallback(long long long) 386 stdcall -noname DPA_DestroyCallback(ptr ptr long) 387 stdcall -noname DSA_EnumCallback(ptr ptr long) 388 stdcall -noname DSA_DestroyCallback(ptr ptr long) -389 stub -noname SHGetProcessDword +389 stdcall -noname comctl32_389(long long) 390 stdcall -noname ImageList_SetColorTable(ptr long long ptr) 400 stdcall -noname CreateMRUListW(ptr) 401 stdcall -noname AddMRUStringW(long wstr) Added: branches/cmake-bringup/dll/win32/comctl32/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl3… ============================================================================== --- branches/cmake-bringup/dll/win32/comctl32/stubs.c (added) +++ branches/cmake-bringup/dll/win32/comctl32/stubs.c [iso-8859-1] Wed Dec 1 21:16:25 2010 @@ -1,0 +1,41 @@ +#include <windows.h> +#include <reactos/debug.h> + +typedef PVOID PREADERMODEINFO; + +HWND +WINAPI +CreatePage( + DWORD dwInitParam, + HWND hWndParent) +{ + UNIMPLEMENTED; + return NULL; +} + +HWND +WINAPI +CreateProxyPage( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +WINAPI +DoReaderMode( + PREADERMODEINFO prmi) +{ + UNIMPLEMENTED; +} + +VOID +WINAPI +comctl32_389( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; +} Propchange: branches/cmake-bringup/dll/win32/comctl32/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 49886: [CMAKE] - Inhibit all warning messages for mesa32.
by akhaldi＠svn.reactos.org 01 Dec '10

01 Dec '10

Author: akhaldi Date: Wed Dec 1 20:49:45 2010 New Revision: 49886 URL: http://svn.reactos.org/svn/reactos?rev=49886&view=rev Log: [CMAKE] - Inhibit all warning messages for mesa32. Modified: branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt Modified: branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/mesa… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] Wed Dec 1 20:49:45 2010 @@ -1,3 +1,7 @@ + +if(NOT MSVC) +add_definitions(-w) +endif() add_definitions( -DUSE_EXTERNAL_DXTN_LIB=1

1 0

[tkreuzer] 49885: [CMAKE] Manual stubs for cabinet
by tkreuzer＠svn.reactos.org 01 Dec '10

01 Dec '10

Author: tkreuzer Date: Wed Dec 1 20:29:09 2010 New Revision: 49885 URL: http://svn.reactos.org/svn/reactos?rev=49885&view=rev Log: [CMAKE] Manual stubs for cabinet Added: branches/cmake-bringup/dll/win32/cabinet/stubs.c (with props) Modified: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt branches/cmake-bringup/dll/win32/cabinet/cabinet.spec Modified: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cabinet… ============================================================================== --- branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] Wed Dec 1 20:29:09 2010 @@ -9,6 +9,7 @@ cabinet_main.c fci.c fdi.c + stubs.c cabinet.rc ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def) @@ -20,4 +21,4 @@ add_importlibs(cabinet kernel32 ntdll) add_dependencies(cabinet psdk buildno_header) -add_cab_target(cabinet 1) +add_cab_target(cabinet 1) Modified: branches/cmake-bringup/dll/win32/cabinet/cabinet.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cabinet… ============================================================================== --- branches/cmake-bringup/dll/win32/cabinet/cabinet.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cabinet/cabinet.spec [iso-8859-1] Wed Dec 1 20:29:09 2010 @@ -1,7 +1,7 @@ -1 stub GetDllVersion +1 stdcall -private GetDllVersion() 2 stdcall -private DllGetVersion (ptr) 3 stdcall Extract(ptr str) -4 stub DeleteExtractedFiles +4 stdcall -private DeleteExtractedFiles(ptr) 10 cdecl FCICreate(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) 11 cdecl FCIAddFile(long ptr ptr long ptr ptr ptr long) 12 cdecl FCIFlushFolder(long ptr ptr) Added: branches/cmake-bringup/dll/win32/cabinet/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cabinet… ============================================================================== --- branches/cmake-bringup/dll/win32/cabinet/stubs.c (added) +++ branches/cmake-bringup/dll/win32/cabinet/stubs.c [iso-8859-1] Wed Dec 1 20:29:09 2010 @@ -1,0 +1,22 @@ +#include <windows.h> +#include <debug.h> + +typedef PVOID PSESSION; + +VOID +WINAPI +DeleteExtractedFiles( + PSESSION ps) +{ + UNIMPLEMENTED; +} + + +LPCSTR +WINAPI +GetDllVersion(void) +{ + /* This is what it returns on Windows XP SP3 */ + return "5.1.2600.5512"; +} + Propchange: branches/cmake-bringup/dll/win32/cabinet/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 49884: [CMAKE] Fix browseui
by tkreuzer＠svn.reactos.org 01 Dec '10

01 Dec '10

Author: tkreuzer Date: Wed Dec 1 20:11:15 2010 New Revision: 49884 URL: http://svn.reactos.org/svn/reactos?rev=49884&view=rev Log: [CMAKE] Fix browseui Added: branches/cmake-bringup/dll/win32/browseui/dllinstall.c (with props) Modified: branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt branches/cmake-bringup/dll/win32/browseui/browseui.spec Modified: branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseu… ============================================================================== --- branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Wed Dec 1 20:11:15 2010 @@ -36,6 +36,7 @@ travellog.cpp utility.cpp browseui.rc + dllinstall.c ${CMAKE_CURRENT_BINARY_DIR}/browseui.def) add_library(browseui SHARED ${SOURCE}) Modified: branches/cmake-bringup/dll/win32/browseui/browseui.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseu… ============================================================================== --- branches/cmake-bringup/dll/win32/browseui/browseui.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/browseui/browseui.spec [iso-8859-1] Wed Dec 1 20:11:15 2010 @@ -1,7 +1,7 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllGetVersion(ptr) -@ stub DllInstall +@ stdcall DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() 101 stdcall -noname InitOCHostClass(long) Added: branches/cmake-bringup/dll/win32/browseui/dllinstall.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseu… ============================================================================== --- branches/cmake-bringup/dll/win32/browseui/dllinstall.c (added) +++ branches/cmake-bringup/dll/win32/browseui/dllinstall.c [iso-8859-1] Wed Dec 1 20:11:15 2010 @@ -1,0 +1,11 @@ +#include <windows.h> + +HRESULT +WINAPI +DllInstall( + BOOL bInstall, + PCWSTR pszCmdLine) +{ + return S_OK; +} + Propchange: branches/cmake-bringup/dll/win32/browseui/dllinstall.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 49883: [CMAKE] wine depends on buildno header
by tkreuzer＠svn.reactos.org 01 Dec '10

01 Dec '10

Author: tkreuzer Date: Wed Dec 1 18:28:34 2010 New Revision: 49883 URL: http://svn.reactos.org/svn/reactos?rev=49883&view=rev Log: [CMAKE] wine depends on buildno header Modified: branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libw… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] Wed Dec 1 18:28:34 2010 @@ -11,3 +11,5 @@ add_library(wine ${SOURCE}) add_library(wineldr loader.c) + +add_dependencies(wine buildno_header)

1 0

[tkreuzer] 49882: [PSDK] Fix include guard for unknown.h
by tkreuzer＠svn.reactos.org 01 Dec '10

01 Dec '10

Author: tkreuzer Date: Wed Dec 1 14:56:05 2010 New Revision: 49882 URL: http://svn.reactos.org/svn/reactos?rev=49882&view=rev Log: [PSDK] Fix include guard for unknown.h Modified: branches/cmake-bringup/include/psdk/unknown.h Modified: branches/cmake-bringup/include/psdk/unknown.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/unkn… ============================================================================== --- branches/cmake-bringup/include/psdk/unknown.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/unknown.h [iso-8859-1] Wed Dec 1 14:56:05 2010 @@ -16,8 +16,8 @@ * */ -#ifndef __unknwn_h__ -#define __unknwn_h__ +#ifndef _UNKNOWN_H_ +#define _UNKNOWN_H_ #ifdef __cplusplus extern "C" { @@ -70,5 +70,5 @@ IN POOL_TYPE PoolType ); -#endif +#endif /* _UNKNOWN_H_ */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs