mirror of
https://github.com/reactos/reactos.git
synced 2024-08-19 18:02:55 +00:00
[CMAKE]
Fix dwmapi, mpr and msxml3. Ordinal stubs were given the same internal names as Wine. svn path=/branches/cmake-bringup/; revision=49881
This commit is contained in:
parent
b9e6a0061a
commit
30922e7435
|
@ -3,9 +3,15 @@ add_definitions(-D__WINESRC__)
|
|||
|
||||
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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
48
dll/win32/dwmapi/dwmapi_ros.diff
Normal file
48
dll/win32/dwmapi/dwmapi_ros.diff
Normal file
|
@ -0,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
|
|
@ -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 @@ add_library(mpr SHARED
|
|||
mpr.rc
|
||||
${CMAKE_CURRENT_BINARY_DIR}/mpr.def)
|
||||
|
||||
add_library(mpr SHARED ${SOURCE})
|
||||
|
||||
set_module_type(mpr win32dll)
|
||||
|
||||
target_link_libraries(mpr wine)
|
||||
|
|
|
@ -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
|
||||
|
|
47
dll/win32/mpr/mpr_ros.diff
Normal file
47
dll/win32/mpr/mpr_ros.diff
Normal file
|
@ -0,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
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
ADD_TYPELIB(msxml3_v1 msxml3_v1.idl)
|
||||
add_dependencies(msxml3_v1 stdole2)
|
||||
|
||||
|
@ -18,9 +17,10 @@ endif(MSVC)
|
|||
|
||||
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 @@ add_library(msxml3 SHARED
|
|||
version.rc
|
||||
${CMAKE_CURRENT_BINARY_DIR}/msxml3.def)
|
||||
|
||||
add_library(msxml3 SHARED ${SOURCE})
|
||||
|
||||
set_module_type(msxml3 win32dll)
|
||||
|
||||
target_link_libraries(msxml3
|
||||
|
|
|
@ -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)
|
||||
|
|
22
dll/win32/msxml3/msxml3_ros.diff
Normal file
22
dll/win32/msxml3/msxml3_ros.diff
Normal file
|
@ -0,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)
|
Loading…
Reference in a new issue