Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[tkreuzer] 49887: [CMAKE] Manual stubs for comctl32

by tkreuzer＠svn.reactos.org

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

13 years, 9 months

[akhaldi] 49886: [CMAKE] - Inhibit all warning messages for mesa32.

by akhaldi＠svn.reactos.org

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

13 years, 9 months

[tkreuzer] 49885: [CMAKE] Manual stubs for cabinet

by tkreuzer＠svn.reactos.org

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

13 years, 9 months

[tkreuzer] 49884: [CMAKE] Fix browseui

by tkreuzer＠svn.reactos.org

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

13 years, 9 months

[tkreuzer] 49883: [CMAKE] wine depends on buildno header

by tkreuzer＠svn.reactos.org

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)

13 years, 9 months

[tkreuzer] 49882: [PSDK] Fix include guard for unknown.h

by tkreuzer＠svn.reactos.org

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_ */

13 years, 9 months

[spetreolle] 49881: [CMAKE] Fix dwmapi, mpr and msxml3. Ordinal stubs were given the same internal names as Wine.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Dec 1 13:36:16 2010 New Revision: 49881 URL: http://svn.reactos.org/svn/reactos?rev=49881&view=rev Log: [CMAKE] Fix dwmapi, mpr and msxml3. Ordinal stubs were given the same internal names as Wine. Added: branches/cmake-bringup/dll/win32/dwmapi/dwmapi_ros.diff branches/cmake-bringup/dll/win32/mpr/mpr_ros.diff branches/cmake-bringup/dll/win32/msxml3/msxml3_ros.diff Modified: branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt branches/cmake-bringup/dll/win32/dwmapi/dwmapi.spec branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt branches/cmake-bringup/dll/win32/mpr/mpr.spec branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt branches/cmake-bringup/dll/win32/msxml3/msxml3.spec Modified: branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dwmapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -3,9 +3,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(dwmapi.dll dwmapi.spec) -add_library(dwmapi SHARED dwmapi_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def) +list(APPEND SOURCE + dwmapi_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def) + +add_library(dwmapi SHARED ${SOURCE}) set_module_type(dwmapi win32dll) Modified: branches/cmake-bringup/dll/win32/dwmapi/dwmapi.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dwmapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,24 +1,24 @@ -100 stub @ -101 stub @ +100 stub DWMAPI_100 +101 stub DWMAPI_101 102 stdcall DwmEnableComposition (long) -103 stub @ -104 stub @ -105 stub @ -106 stub @ -107 stub @ -108 stub @ -109 stub @ -110 stub @ -111 stub @ -112 stub @ -113 stub @ +103 stub DWMAPI_103 +104 stub DWMAPI_104 +105 stub DWMAPI_105 +106 stub DWMAPI_106 +107 stub DWMAPI_107 +108 stub DWMAPI_108 +109 stub DWMAPI_109 +110 stub DWMAPI_110 +111 stub DWMAPI_111 +112 stub DWMAPI_112 +113 stub DWMAPI_113 -115 stub @ -116 stub @ -117 stub @ -118 stub @ -119 stub @ -120 stub @ +115 stub DWMAPI_114 +116 stub DWMAPI_115 +117 stub DWMAPI_116 +118 stub DWMAPI_117 +119 stub DWMAPI_118 +120 stub DWMAPI_120 @ stub DwmAttachMilContent @ stub DwmDefWindowProc Added: branches/cmake-bringup/dll/win32/dwmapi/dwmapi_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dwmapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dwmapi/dwmapi_ros.diff (added) +++ branches/cmake-bringup/dll/win32/dwmapi/dwmapi_ros.diff [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,0 +1,48 @@ +Index: dwmapi.spec +=================================================================== +--- dwmapi.spec (revision 49877) ++++ dwmapi.spec (working copy) +@@ -1,24 +1,24 @@ +-100 stub @ +-101 stub @ ++100 stub DWMAPI_100 ++101 stub DWMAPI_101 + 102 stdcall DwmEnableComposition (long) +-103 stub @ +-104 stub @ +-105 stub @ +-106 stub @ +-107 stub @ +-108 stub @ +-109 stub @ +-110 stub @ +-111 stub @ +-112 stub @ +-113 stub @ ++103 stub DWMAPI_103 ++104 stub DWMAPI_104 ++105 stub DWMAPI_105 ++106 stub DWMAPI_106 ++107 stub DWMAPI_107 ++108 stub DWMAPI_108 ++109 stub DWMAPI_109 ++110 stub DWMAPI_110 ++111 stub DWMAPI_111 ++112 stub DWMAPI_112 ++113 stub DWMAPI_113 + +-115 stub @ +-116 stub @ +-117 stub @ +-118 stub @ +-119 stub @ +-120 stub @ ++115 stub DWMAPI_114 ++116 stub DWMAPI_115 ++117 stub DWMAPI_116 ++118 stub DWMAPI_117 ++119 stub DWMAPI_118 ++120 stub DWMAPI_120 + + @ stub DwmAttachMilContent + @ stub DwmDefWindowProc Modified: branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,12 +1,12 @@ - add_definitions(-D__WINESRC__) add_definitions(-D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(mpr.dll mpr.spec) -add_library(mpr SHARED +list(APPEND SOURCE auth.c mpr_main.c multinet.c @@ -16,6 +16,8 @@ mpr.rc ${CMAKE_CURRENT_BINARY_DIR}/mpr.def) +add_library(mpr SHARED ${SOURCE}) + set_module_type(mpr win32dll) target_link_libraries(mpr wine) Modified: branches/cmake-bringup/dll/win32/mpr/mpr.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr.spec [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,23 +1,23 @@ # ordinal exports - 1 stub @ - 2 stub @ - 3 stub @ - 4 stub @ - 5 stub @ - 6 stub @ - 7 stub @ - 8 stub @ - 9 stub @ -12 stub @ -13 stub @ -14 stub @ -15 stub @ -16 stub @ -17 stub @ -18 stub @ -19 stub @ -20 stub @ -21 stub @ + 1 stub MPR_1 + 2 stub MPR_2 + 3 stub MPR_3 + 4 stub MPR_4 + 5 stub MPR_5 + 6 stub MPR_6 + 7 stub MPR_7 + 8 stub MPR_8 + 9 stub MPR_9 +12 stub MPR_12 +13 stub MPR_13 +14 stub MPR_14 +15 stub MPR_15 +16 stub MPR_16 +17 stub MPR_17 +18 stub MPR_18 +19 stub MPR_19 +20 stub MPR_20 +21 stub MPR_21 22 stdcall @(long) MPR_Alloc 23 stdcall @(ptr long) MPR_ReAlloc 24 stdcall @(ptr) MPR_Free Added: branches/cmake-bringup/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_ros.diff (added) +++ branches/cmake-bringup/dll/win32/mpr/mpr_ros.diff [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,0 +1,47 @@ +Index: mpr.spec +=================================================================== +--- mpr.spec (revision 49877) ++++ mpr.spec (working copy) +@@ -1,23 +1,23 @@ + # ordinal exports +- 1 stub @ +- 2 stub @ +- 3 stub @ +- 4 stub @ +- 5 stub @ +- 6 stub @ +- 7 stub @ +- 8 stub @ +- 9 stub @ +-12 stub @ +-13 stub @ +-14 stub @ +-15 stub @ +-16 stub @ +-17 stub @ +-18 stub @ +-19 stub @ +-20 stub @ +-21 stub @ ++ 1 stub MPR_1 ++ 2 stub MPR_2 ++ 3 stub MPR_3 ++ 4 stub MPR_4 ++ 5 stub MPR_5 ++ 6 stub MPR_6 ++ 7 stub MPR_7 ++ 8 stub MPR_8 ++ 9 stub MPR_9 ++12 stub MPR_12 ++13 stub MPR_13 ++14 stub MPR_14 ++15 stub MPR_15 ++16 stub MPR_16 ++17 stub MPR_17 ++18 stub MPR_18 ++19 stub MPR_19 ++20 stub MPR_20 ++21 stub MPR_21 + 22 stdcall @(long) MPR_Alloc + 23 stdcall @(ptr long) MPR_ReAlloc + 24 stdcall @(ptr) MPR_Free Modified: branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msxml3/… ============================================================================== --- branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,4 +1,3 @@ - ADD_TYPELIB(msxml3_v1 msxml3_v1.idl) add_dependencies(msxml3_v1 stdole2) @@ -18,9 +17,10 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(msxml3.dll msxml3.spec) -add_library(msxml3 SHARED +list(APPEND SOURCE attribute.c comment.c domdoc.c @@ -50,6 +50,8 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def) +add_library(msxml3 SHARED ${SOURCE}) + set_module_type(msxml3 win32dll) target_link_libraries(msxml3 Modified: branches/cmake-bringup/dll/win32/msxml3/msxml3.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msxml3/… ============================================================================== --- branches/cmake-bringup/dll/win32/msxml3/msxml3.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msxml3/msxml3.spec [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,10 +1,10 @@ - 6 stub @ - 7 stub @ - 8 stub @ - 9 stub @ -10 stub @ -11 stub @ -12 stub @ + 6 stub MSXML3_6 + 7 stub MSXML3_7 + 8 stub MSXML3_8 + 9 stub MSXML3_9 +10 stub MSXML3_10 +11 stub MSXML3_11 +12 stub MSXML3_12 @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) Added: branches/cmake-bringup/dll/win32/msxml3/msxml3_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msxml3/… ============================================================================== --- branches/cmake-bringup/dll/win32/msxml3/msxml3_ros.diff (added) +++ branches/cmake-bringup/dll/win32/msxml3/msxml3_ros.diff [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,0 +1,22 @@ +Index: msxml3.spec +=================================================================== +--- msxml3.spec (revision 49877) ++++ msxml3.spec (working copy) +@@ -1,10 +1,10 @@ +- 6 stub @ +- 7 stub @ +- 8 stub @ +- 9 stub @ +-10 stub @ +-11 stub @ +-12 stub @ ++ 6 stub MSXML3_6 ++ 7 stub MSXML3_7 ++ 8 stub MSXML3_8 ++ 9 stub MSXML3_9 ++10 stub MSXML3_10 ++11 stub MSXML3_11 ++12 stub MSXML3_12 + + @ stdcall -private DllCanUnloadNow() + @ stdcall -private DllGetClassObject(ptr ptr ptr)

13 years, 9 months

[tkreuzer] 49880: [CMAKE] manual stubs for atl

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 1 13:16:39 2010 New Revision: 49880 URL: http://svn.reactos.org/svn/reactos?rev=49880&view=rev Log: [CMAKE] manual stubs for atl Added: branches/cmake-bringup/dll/win32/atl/stubs.c (with props) Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt branches/cmake-bringup/dll/win32/atl/atl.spec Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] Wed Dec 1 13:16:39 2010 @@ -14,6 +14,7 @@ atl_ax.c atl_main.c registrar.c + stubs.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/atl.def) Modified: branches/cmake-bringup/dll/win32/atl/atl.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/atl… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/atl.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/atl/atl.spec [iso-8859-1] Wed Dec 1 13:16:39 2010 @@ -16,18 +16,18 @@ 21 stdcall AtlModuleTerm(ptr) 22 stdcall AtlModuleUnregisterServer(ptr ptr) 23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) -24 stub AtlWaitWithMessageLoop -25 stub AtlSetErrorInfo +24 stdcall AtlWaitWithMessageLoop(ptr) +25 stdcall AtlSetErrorInfo(ptr ptr long ptr ptr ptr ptr) 26 stdcall AtlCreateTargetDC(long ptr) 27 stdcall AtlHiMetricToPixel(ptr ptr) 28 stdcall AtlPixelToHiMetric(ptr ptr) -29 stub AtlDevModeW2A +29 stdcall AtlDevModeW2A(ptr ptr) 30 stdcall AtlComPtrAssign(ptr ptr) 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) -34 stub AtlGetVersion -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +34 stdcall AtlGetVersion(ptr) +35 stdcall AtlAxDialogBoxW(ptr wstr ptr ptr ptr) +36 stdcall AtlAxDialogBoxA(ptr str ptr ptr ptr) 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) 38 stdcall AtlAxCreateDialogA(long str long ptr long) 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) @@ -40,13 +40,13 @@ 46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) -49 stub AtlRegisterClassCategoriesHelper +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) -52 stub AtlIPersistPropertyBag_Load -53 stub AtlIPersistPropertyBag_Save -54 stub AtlGetObjectSourceInterface -55 stub AtlModuleUnRegisterTypeLib +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) +53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr) +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) +55 stdcall AtlModuleUnregisterTypeLib(ptr str) 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) Added: branches/cmake-bringup/dll/win32/atl/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/stu… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/stubs.c (added) +++ branches/cmake-bringup/dll/win32/atl/stubs.c [iso-8859-1] Wed Dec 1 13:16:39 2010 @@ -1,0 +1,127 @@ +#include <windows.h> +#include <debug.h> + +#define ATLAPI_(x) x WINAPI +#define ATLAPI ATLAPI_(HRESULT) + +struct _ATL_CATMAP_ENTRY; +typedef struct _ATL_PROPMAP_ENTRY ATL_PROPMAP_ENTRY; +typedef struct _ATL_MODULE _ATL_MODULE; + +BOOL +WINAPI +AtlWaitWithMessageLoop( + HANDLE hEvent) +{ + UNIMPLEMENTED; + return FALSE; +} + +ATLAPI +AtlSetErrorInfo( + const CLSID *pclsid, + LPCOLESTR lpszDesc, + DWORD dwHelpID, + LPCOLESTR lpszHelpFile, + const IID *piid, + HRESULT hRes, + HINSTANCE hInst) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ATLAPI_(LPDEVMODEA) +AtlDevModeW2A(LPDEVMODEA lpDevModeA, LPDEVMODEW lpDevModeW) +{ + UNIMPLEMENTED; + return NULL; +} + +ATLAPI_(DWORD) +AtlGetVersion(void* pReserved) +{ + UNIMPLEMENTED; + return 0; +} + +ATLAPI_(int) +AtlAxDialogBoxW( + HINSTANCE hInstance, + LPCWSTR lpTemplateName, + HWND hWndParent, + DLGPROC lpDialogProc, + LPARAM dwInitParam) +{ + UNIMPLEMENTED; + return 0; +} + +ATLAPI_(int) +AtlAxDialogBoxA( + HINSTANCE hInstance, + LPCSTR lpTemplateName, + HWND hWndParent, + DLGPROC lpDialogProc, + LPARAM dwInitParam) +{ + UNIMPLEMENTED; + return 0; +} + +ATLAPI_(int) +AtlRegisterClassCategoriesHelper( + const CLSID *pclsid, + const struct _ATL_CATMAP_ENTRY* pEntry, + BOOL arg3) +{ + UNIMPLEMENTED; + return 0; +} + +ATLAPI +AtlIPersistPropertyBag_Load( + LPPROPERTYBAG pPropBag, + LPERRORLOG pErrorLog, + const ATL_PROPMAP_ENTRY* pMap, + void* pThis, + IUnknown* pUnk) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ATLAPI +AtlIPersistPropertyBag_Save( + LPPROPERTYBAG pPropBag, + BOOL fClearDirty, + BOOL fSaveAllProperties, + const ATL_PROPMAP_ENTRY* pMap, + void* pThis, + IUnknown* pUnk) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ATLAPI +AtlGetObjectSourceInterface( + IUnknown* punkObj, + GUID* plibid, + IID* piid, + unsigned short* pdwMajor, + unsigned short* pdwMinor) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ATLAPI +AtlModuleUnregisterTypeLib( + _ATL_MODULE* pM, + LPCOLESTR lpszIndex) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + Propchange: branches/cmake-bringup/dll/win32/atl/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 9 months

[tkreuzer] 49879: [CMAKE] Manual stubs for activeds

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 1 09:44:45 2010 New Revision: 49879 URL: http://svn.reactos.org/svn/reactos?rev=49879&view=rev Log: [CMAKE] Manual stubs for activeds Added: branches/cmake-bringup/dll/win32/activeds/stubs.c (with props) Modified: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt branches/cmake-bringup/dll/win32/activeds/activeds.spec Modified: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… ============================================================================== --- branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] Wed Dec 1 09:44:45 2010 @@ -7,6 +7,7 @@ list(APPEND SOURCE activeds_main.c + stubs.c ${CMAKE_CURRENT_BINARY_DIR}/activeds.def) add_library(activeds SHARED ${SOURCE}) Modified: branches/cmake-bringup/dll/win32/activeds/activeds.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… ============================================================================== --- branches/cmake-bringup/dll/win32/activeds/activeds.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/activeds/activeds.spec [iso-8859-1] Wed Dec 1 09:44:45 2010 @@ -1,28 +1,28 @@ 3 stdcall ADsGetObject(wstr ptr ptr) 4 stdcall ADsBuildEnumerator(ptr ptr) -5 stub ADsFreeEnumerator +5 stdcall ADsFreeEnumerator(ptr) 6 stdcall ADsEnumerateNext(ptr long ptr ptr) -7 stub ADsBuildVarArrayStr -8 stub ADsBuildVarArrayInt +7 stdcall ADsBuildVarArrayStr(ptr long ptr) +8 stdcall ADsBuildVarArrayInt(ptr long ptr) 9 stdcall ADsOpenObject(wstr wstr wstr long ptr ptr) -12 stub ADsSetLastError +12 stdcall ADsSetLastError(long str str) 13 stdcall ADsGetLastError(ptr ptr long ptr long) -14 stub AllocADsMem +14 stdcall AllocADsMem(long) 15 stdcall FreeADsMem(ptr) -16 stub ReallocADsMem -17 stub AllocADsStr -18 stub FreeADsStr -19 stub ReallocADsStr -20 stub ADsEncodeBinaryData -21 stub PropVariantToAdsType -22 stub AdsTypeToPropVariant -23 stub AdsFreeAdsValues -24 stub ADsDecodeBinaryData -25 stub AdsTypeToPropVariant2 -26 stub PropVariantToAdsType2 -27 stub ConvertSecDescriptorToVariant -28 stub ConvertSecurityDescriptorToSecDes -#@ stub DllCanUnloadNow -#@ stub DllGetClassObject -#@ stub DllRegisterServer -#@ stub DllUnregisterServer +16 stdcall ReallocADsMem(ptr long long) +17 stdcall AllocADsStr(ptr) +18 stdcall FreeADsStr(ptr) +19 stdcall ReallocADsStr(ptr ptr) +20 stdcall ADsEncodeBinaryData(ptr long ptr) +21 stdcall PropVariantToAdsType(ptr long ptr ptr) +22 stdcall AdsTypeToPropVariant(ptr long ptr) +23 stdcall AdsFreeAdsValues(ptr long) +24 stdcall ADsDecodeBinaryData(wstr ptr long) +25 cdecl AdsTypeToPropVariant2() # unknown prototype +26 cdecl PropVariantToAdsType2() # unknown prototype +27 cdecl ConvertSecDescriptorToVariant() # unknown prototype +28 cdecl ConvertSecurityDescriptorToSecDes() # unknown prototype +#@ stdcall -private DllCanUnloadNow() +#@ stdcall -private DllGetClassObject(ptr ptr ptr) +#@ stdcall -private DllRegisterServer() +#@ stdcall -private DllUnregisterServer() Added: branches/cmake-bringup/dll/win32/activeds/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… ============================================================================== --- branches/cmake-bringup/dll/win32/activeds/stubs.c (added) +++ branches/cmake-bringup/dll/win32/activeds/stubs.c [iso-8859-1] Wed Dec 1 09:44:45 2010 @@ -1,0 +1,176 @@ +#include <windows.h> +#include <iads.h> +#include <stubs.h> + +// FIXME: should go to iads.h +typedef struct _adsvalue *PADSVALUE; + +HRESULT +WINAPI +ADsFreeEnumerator( + IN IEnumVARIANT *pEnumVariant) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +ADsBuildVarArrayStr( + LPWSTR *lppPathNames, + DWORD dwPathNames, + VARIANT *pVar) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +ADsBuildVarArrayInt( + LPDWORD lpdwObjectTypes, + DWORD dwObjectTypes, + VARIANT *pVar) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +VOID +WINAPI +ADsSetLastError( + IN DWORD dwErr, + IN LPCWSTR pszError, + IN LPCWSTR pszProvider) + +{ + UNIMPLEMENTED; +} + +LPVOID +WINAPI +AllocADsMem(DWORD cb) +{ + UNIMPLEMENTED; + return NULL; +} + +LPVOID +WINAPI +ReallocADsMem( + LPVOID pOldMem, + DWORD cbOld, + DWORD cbNew) +{ + UNIMPLEMENTED; + return NULL; +} + +LPWSTR +WINAPI +AllocADsStr(LPCWSTR pStr) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +WINAPI +FreeADsStr(IN LPWSTR pStr) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +ReallocADsStr( + IN OUT LPWSTR *ppStr, + IN LPWSTR pStr) +{ + UNIMPLEMENTED; + return FALSE; +} + +HRESULT +WINAPI +ADsEncodeBinaryData( + PBYTE pbSrcData, + DWORD dwSrcLen, + OUT LPWSTR *ppszDestData) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +PropVariantToAdsType( + VARIANT * pVariant, + DWORD dwNumVariant, + PADSVALUE *ppAdsValues, + PDWORD pdwNumValues) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +AdsTypeToPropVariant( + PADSVALUE pAdsValues, + DWORD dwNumValues, + VARIANT * pVariant) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +void +WINAPI +AdsFreeAdsValues( + PADSVALUE pAdsValues, + DWORD dwNumValues) +{ + UNIMPLEMENTED; +} + +HRESULT +WINAPI +ADsDecodeBinaryData( + LPCWSTR szSrcData, + PBYTE *ppbDestData, + ULONG *pdwDestLen) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +int AdsTypeToPropVariant2() +{ + DPRINT1("WARNING: calling stub AdsTypeToPropVariant2()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; +} + +int PropVariantToAdsType2() +{ + DPRINT1("WARNING: calling stub PropVariantToAdsType2()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; +} + +int ConvertSecDescriptorToVariant() +{ + DPRINT1("WARNING: calling stub ConvertSecDescriptorToVariant()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; +} + +int ConvertSecurityDescriptorToSecDes() +{ + DPRINT1("WARNING: calling stub ConvertSecurityDescriptorToSecDes()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; +} + Propchange: branches/cmake-bringup/dll/win32/activeds/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 9 months

Jump to page:

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