Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[tkreuzer] 49897: [MSVC] Fix typeof(WineDirect3DCreateClipper) definition for MSVC.
by tkreuzer＠svn.reactos.org 02 Dec '10

02 Dec '10

Author: tkreuzer Date: Thu Dec 2 13:37:59 2010 New Revision: 49897 URL: http://svn.reactos.org/svn/reactos?rev=49897&view=rev Log: [MSVC] Fix typeof(WineDirect3DCreateClipper) definition for MSVC. Modified: branches/cmake-bringup/include/reactos/wine/typeof.h Modified: branches/cmake-bringup/include/reactos/wine/typeof.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/typeof.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/typeof.h [iso-8859-1] Thu Dec 2 13:37:59 2010 @@ -25,7 +25,7 @@ struct jpeg_decompress_struct; typedef struct IWineD3D * (__stdcall typeof(WineDirect3DCreate))(unsigned int, struct IUnknown *); -typedef struct IWineD3DClipper * (__stdcall typeof(WineDirect3DCreateClipper))(struct IUnknown *); +typedef struct IWineD3DClipper * (__stdcall typeof(WineDirect3DCreateClipper))(void); typedef int (__stdcall typeof(ImeInquire))(struct _tagIMEINFO *, __typeof_wchar *, const __typeof_wchar *); typedef int (__stdcall typeof(ImeConfigure))(void *, void *, unsigned int, void *); typedef int (__stdcall typeof(ImeDestroy))(unsigned int);

1 0

[spetreolle] 49896: [CMAKE] Update msvcrt stubs.
by spetreolle＠svn.reactos.org 02 Dec '10

02 Dec '10

Author: spetreolle Date: Thu Dec 2 13:32:01 2010 New Revision: 49896 URL: http://svn.reactos.org/svn/reactos?rev=49896&view=rev Log: [CMAKE] Update msvcrt stubs. Modified: branches/cmake-bringup/dll/win32/msvcrt/stubs.c Modified: branches/cmake-bringup/dll/win32/msvcrt/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/stubs.c [iso-8859-1] Thu Dec 2 13:32:01 2010 @@ -1,11 +1,6 @@ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wine/config.h" -#include "wine/exception.h" +#include <stubs.h> -void __wine_spec_unimplemented_stub( const char *module, const char *function ); #define UNIMPLEMENTED __wine_spec_unimplemented_stub("msvcrt.dll", __FUNCTION__) int __get_app_type()

1 0

[spetreolle] 49895: [CMAKE] Fix build for winmm and syssetup.
by spetreolle＠svn.reactos.org 02 Dec '10

02 Dec '10

Author: spetreolle Date: Thu Dec 2 12:58:59 2010 New Revision: 49895 URL: http://svn.reactos.org/svn/reactos?rev=49895&view=rev Log: [CMAKE] Fix build for winmm and syssetup. Modified: branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt branches/cmake-bringup/dll/win32/winmm/winmm.spec Modified: branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/syssetu… ============================================================================== --- branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] Thu Dec 2 12:58:59 2010 @@ -1,11 +1,11 @@ - set_unicode() add_definitions(-D_DLL -D__USE_CRTIMP) +set_rc_compiler() spec2def(syssetup.dll syssetup.spec) -add_library(syssetup SHARED +list(APPEND SOURCE classinst.c dllmain.c install.c @@ -13,6 +13,8 @@ wizard.c syssetup.rc ${CMAKE_CURRENT_BINARY_DIR}/syssetup.def) + +add_library(syssetup SHARED ${SOURCE}) set_module_type(syssetup win32dll) Modified: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/C… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Thu Dec 2 12:58:59 2010 @@ -6,7 +6,7 @@ set_rc_compiler() -add_library(winmm SHARED +list(APPEND SOURCE driver.c joystick.c lolvldrv.c @@ -18,6 +18,8 @@ winmm.c winmm_res.rc ${CMAKE_CURRENT_BINARY_DIR}/winmm.def) + +add_library(winmm SHARED ${SOURCE}) set_module_type(winmm win32dll) Modified: branches/cmake-bringup/dll/win32/winmm/winmm.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/w… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/winmm.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/winmm.spec [iso-8859-1] Thu Dec 2 12:58:59 2010 @@ -1,7 +1,7 @@ # ordinal exports 1 stdcall @(ptr long long) PlaySoundA -3 stub @ -4 stub @ +3 stub WINMM_3 +4 stub WINMM_4 @ stdcall CloseDriver(long long long) @ stdcall DefDriverProc(long long long long long)

1 0

[spetreolle] 49894: [CMAKE] Disable msnet32.
by spetreolle＠svn.reactos.org 02 Dec '10

02 Dec '10

Author: spetreolle Date: Thu Dec 2 12:38:16 2010 New Revision: 49894 URL: http://svn.reactos.org/svn/reactos?rev=49894&view=rev Log: [CMAKE] Disable msnet32. Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Thu Dec 2 12:38:16 2010 @@ -96,7 +96,7 @@ add_subdirectory(msimtf) add_subdirectory(msisip) add_subdirectory(msisys.ocx) -add_subdirectory(msnet32) +#add_subdirectory(msnet32) #to be deleted in trunk. add_subdirectory(msrle32) add_subdirectory(mssign32) add_subdirectory(mssip32)

1 0

[spetreolle] 49893: [CMAKE] Add stubs file to source automatically. Gcc: fix set_rc_compiler() so that it doesn't conflict with custom_incdefs().
by spetreolle＠svn.reactos.org 02 Dec '10

02 Dec '10

Author: spetreolle Date: Thu Dec 2 12:36:16 2010 New Revision: 49893 URL: http://svn.reactos.org/svn/reactos?rev=49893&view=rev Log: [CMAKE] Add stubs file to source automatically. Gcc: fix set_rc_compiler() so that it doesn't conflict with custom_incdefs(). Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Thu Dec 2 12:36:16 2010 @@ -13,6 +13,9 @@ add_definitions(-mrtd -fno-builtin -w) endif() +spec2def(classpnp.sys class.spec) + +list(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_BINARY_DIR}/class_stubs.c) list(APPEND SOURCE autorun.c class.c @@ -31,8 +34,6 @@ class.rc ${CMAKE_CURRENT_BINARY_DIR}/class.def) -spec2def(classpnp.sys class.spec) - add_library(classpnp SHARED ${SOURCE}) target_link_libraries(classpnp ${PSEH_LIB} libcntpr) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Thu Dec 2 12:36:16 2010 @@ -173,14 +173,14 @@ get_directory_property(includes INCLUDE_DIRECTORIES) foreach(arg ${defines}) - set(result_defs "${result_defs} -D${arg}") + set(rc_result_defs "${rc_result_defs} -D${arg}") endforeach(arg ${defines}) foreach(arg ${includes}) - set(result_incs "-I${arg} ${result_incs}") + set(rc_result_incs "-I${arg} ${rc_result_incs}") endforeach(arg ${includes}) - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>") + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>") endmacro() #idl files support @@ -206,6 +206,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) + list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c) endmacro() # Optional 3rd parameter: dllname Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Thu Dec 2 12:36:16 2010 @@ -200,6 +200,7 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) + list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c) endmacro() # Optional 3rd parameter: dllname

1 0

[tkreuzer] 49892: [CMAKE] D3DXCreateTexture is already implemented, not a stub
by tkreuzer＠svn.reactos.org 02 Dec '10

02 Dec '10

Author: tkreuzer Date: Thu Dec 2 12:14:35 2010 New Revision: 49892 URL: http://svn.reactos.org/svn/reactos?rev=49892&view=rev Log: [CMAKE] D3DXCreateTexture is already implemented, not a stub Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36.spec 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 12:14:35 2010 @@ -92,7 +92,7 @@ @ 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 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)

1 0

[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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010