[CMAKE]

- Add mciseq, mciwave, mmdrv, modemui, mpr, mprapi, msadp32.acm, msafd and mscms to build.
- Fixed mpr resource files (should be submitted upstream).

svn path=/branches/cmake-bringup/; revision=48613

diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt
index 761de68..f637332 100644 (file)
--- a/dll/win32/CMakeLists.txt
+++ b/dll/win32/CMakeLists.txt
@@ -45,5 +45,14 @@ add_subdirectory(mapi32)
 add_subdirectory(mciavi32)
 add_subdirectory(mcicda)
 add_subdirectory(mciqtz32)
+add_subdirectory(mciseq)
+add_subdirectory(mciwave)
+add_subdirectory(mmdrv)
+add_subdirectory(modemui)
+add_subdirectory(mpr)
+add_subdirectory(mprapi)
+add_subdirectory(msadp32.acm)
+add_subdirectory(msafd)
+add_subdirectory(mscms)
 add_subdirectory(msvcrt)
 add_subdirectory(user32)

diff --git a/dll/win32/mciseq/CMakeLists.txt b/dll/win32/mciseq/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9293d46
--- /dev/null
+++ b/dll/win32/mciseq/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw")
+
+add_definitions(-D__WINESRC__)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(mciseq ${CMAKE_CURRENT_SOURCE_DIR}/mciseq.spec ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def)
+
+add_library(mciseq SHARED mcimidi.c)
+
+set_target_properties(mciseq PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(mciseq
+    ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def
+    wine
+    -lwinmm
+    mingw_common
+    ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a)
+
+add_dependencies(mciseq mciseq_def psdk)

diff --git a/dll/win32/mciwave/CMakeLists.txt b/dll/win32/mciwave/CMakeLists.txt
new file mode 100644 (file)
index 0000000..3d031da
--- /dev/null
+++ b/dll/win32/mciwave/CMakeLists.txt
@@ -0,0 +1,24 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw")
+
+add_definitions(-D__WINESRC__)
+add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(-D_WINE)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(mciwave ${CMAKE_CURRENT_SOURCE_DIR}/mciwave.spec ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def)
+
+add_library(mciwave SHARED mciwave.c)
+
+set_target_properties(mciwave PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(mciwave
+    ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def
+    wine
+    -lwinmm
+    mingw_common
+    ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a
+    ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a)
+
+add_dependencies(mciwave mciwave_def psdk)

diff --git a/dll/win32/mmdrv/CMakeLists.txt b/dll/win32/mmdrv/CMakeLists.txt
new file mode 100644 (file)
index 0000000..785be0a
--- /dev/null
+++ b/dll/win32/mmdrv/CMakeLists.txt
@@ -0,0 +1,26 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+
+add_definitions(-DNDEBUG)
+add_definitions(-DUNICODE -D_UNICODE)
+
+spec2def(mmdrv ${CMAKE_CURRENT_SOURCE_DIR}/mmdrv.spec ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
+
+add_library(mmdrv SHARED
+    entry.c
+    mme.c
+    kernel.c
+    session.c
+    common.c
+    wave.c
+    wave_io.c)
+
+set_target_properties(mmdrv PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(mmdrv
+    ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def
+    -lwinmm
+    ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a
+    ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a)
+
+add_dependencies(mmdrv mmdrv_def psdk)

diff --git a/dll/win32/modemui/CMakeLists.txt b/dll/win32/modemui/CMakeLists.txt
new file mode 100644 (file)
index 0000000..7be32c0
--- /dev/null
+++ b/dll/win32/modemui/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+
+add_definitions(-DUNICODE -D_UNICODE)
+
+spec2def(modemui ${CMAKE_CURRENT_SOURCE_DIR}/modemui.spec ${CMAKE_CURRENT_BINARY_DIR}/modemui.def)
+
+add_library(modemui SHARED modemui.c modemui.rc)
+
+set_target_properties(modemui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(modemui
+    ${CMAKE_CURRENT_BINARY_DIR}/modemui.def
+    ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a)
+
+add_dependencies(modemui modemui_def psdk)

diff --git a/dll/win32/mpr/CMakeLists.txt b/dll/win32/mpr/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a632a32
--- /dev/null
+++ b/dll/win32/mpr/CMakeLists.txt
@@ -0,0 +1,29 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw")
+
+add_definitions(-D__WINESRC__)
+add_definitions(-D_WINE)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(mpr ${CMAKE_CURRENT_SOURCE_DIR}/mpr.spec ${CMAKE_CURRENT_BINARY_DIR}/mpr.def)
+
+add_library(mpr SHARED
+    auth.c
+    mpr_main.c
+    multinet.c
+    nps.c
+    pwcache.c
+    wnet.c
+    mpr.rc)
+
+set_target_properties(mpr PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(mpr
+    ${CMAKE_CURRENT_BINARY_DIR}/mpr.def
+    wine
+    mingw_common
+    -ladvapi32
+    -luser32)
+
+add_dependencies(mpr mpr_def psdk)

diff --git a/dll/win32/mpr/mpr_Bg.rc b/dll/win32/mpr/mpr_Bg.rc
index 52353d2..5f1e402 100644 (file)
--- a/dll/win32/mpr/mpr_Bg.rc
+++ b/dll/win32/mpr/mpr_Bg.rc
@@ -37,8 +37,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "Ïîòðåáèòåë", -1, 40, 66, 50, 10
  LTEXT "Ïàðîëà", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Save this password (Insecure)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Cs.rc b/dll/win32/mpr/mpr_Cs.rc
index 8e32de4..024be05 100644 (file)
--- a/dll/win32/mpr/mpr_Cs.rc
+++ b/dll/win32/mpr/mpr_Cs.rc
@@ -40,8 +40,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "U\9eivatel", -1, 40, 66, 50, 10
  LTEXT "Heslo", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Ulo\9eit toto heslo (Není bezpeèné) ?", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Da.rc b/dll/win32/mpr/mpr_Da.rc
index 52dc635..2909201 100644 (file)
--- a/dll/win32/mpr/mpr_Da.rc
+++ b/dll/win32/mpr/mpr_Da.rc
@@ -37,8 +37,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "Brugernavn", -1, 40, 66, 50, 10
  LTEXT "Kodeord", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "Gem dette ko&deord (usikkert)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_De.rc b/dll/win32/mpr/mpr_De.rc
index d8b1298..b9372d7 100644 (file)
--- a/dll/win32/mpr/mpr_De.rc
+++ b/dll/win32/mpr/mpr_De.rc
@@ -39,8 +39,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Bereich", -1, 40, 46, 50, 10 */
  LTEXT "Benutzername", -1, 40, 66, 50, 10
  LTEXT "Kennwort", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "Dieses Kennwort speichern (unsicher)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_En.rc b/dll/win32/mpr/mpr_En.rc
index c6fdf72..916c001 100644 (file)
--- a/dll/win32/mpr/mpr_En.rc
+++ b/dll/win32/mpr/mpr_En.rc
@@ -37,8 +37,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "User", -1, 40, 66, 50, 10
  LTEXT "Password", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Save this password (Insecure)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Es.rc b/dll/win32/mpr/mpr_Es.rc
index 630a9fe..ae07325 100644 (file)
--- a/dll/win32/mpr/mpr_Es.rc
+++ b/dll/win32/mpr/mpr_Es.rc
@@ -37,8 +37,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "Usuario", -1, 40, 66, 50, 10
  LTEXT "Contraseña", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Guardar esta contraseña (Inseguro)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Fr.rc b/dll/win32/mpr/mpr_Fr.rc
index 4481639..497781a 100644 (file)
--- a/dll/win32/mpr/mpr_Fr.rc
+++ b/dll/win32/mpr/mpr_Fr.rc
@@ -41,8 +41,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "Utilisateur", -1, 10, 68, 45, 10
  LTEXT "Mot de passe", -1, 10, 88, 45, 10
- LTEXT "" IDC_PROXY, 56, 32, 144, 14, 0
- LTEXT "" IDC_REALM, 56, 46, 144, 14, 0
+ LTEXT "", IDC_PROXY, 56, 32, 144, 14, 0
+ LTEXT "", IDC_REALM, 56, 46, 144, 14, 0
  EDITTEXT IDC_USERNAME, 56, 66, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 56, 86, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Enregistrer ce mot de passe (risqué)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Hu.rc b/dll/win32/mpr/mpr_Hu.rc
index 32c32dd..864b651 100644 (file)
--- a/dll/win32/mpr/mpr_Hu.rc
+++ b/dll/win32/mpr/mpr_Hu.rc
@@ -37,8 +37,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "Felhasználónév", -1, 40, 66, 50, 10
  LTEXT "Jelszó", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Jelszó mentése (nem biztonságos)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_It.rc b/dll/win32/mpr/mpr_It.rc
index 7067ee3..148d2cf 100644 (file)
--- a/dll/win32/mpr/mpr_It.rc
+++ b/dll/win32/mpr/mpr_It.rc
@@ -38,8 +38,8 @@ LTEXT "Proxy", -1, 40, 26, 50, 10
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
 LTEXT "Utente", -1, 40, 66, 50, 10
 LTEXT "Password", -1, 40, 86, 50, 10
-LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
-LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
 EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
 CHECKBOX "&Memorizza la password ( RISCHIOSO! )", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Ja.rc b/dll/win32/mpr/mpr_Ja.rc
index a662ce7..942eaa2 100644 (file)
--- a/dll/win32/mpr/mpr_Ja.rc
+++ b/dll/win32/mpr/mpr_Ja.rc
@@ -40,8 +40,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "ユーザー名", -1, 40, 66, 50, 10
  LTEXT "パスワード", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "パスワードを保存する(&S)(セキュアではありません)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Ko.rc b/dll/win32/mpr/mpr_Ko.rc
index 4ebbd8f..d3e308f 100644 (file)
--- a/dll/win32/mpr/mpr_Ko.rc
+++ b/dll/win32/mpr/mpr_Ko.rc
@@ -38,8 +38,8 @@ FONT 9, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "»ç¿ëÀÚ", -1, 40, 66, 50, 10
  LTEXT "¾ÏÈ£", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "¾ÏÈ£ ÀúÀå(&S) (º¸¾È¿¡ ÁÖÀÇ)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Lt.rc b/dll/win32/mpr/mpr_Lt.rc
index d086d94..9e09737 100644 (file)
--- a/dll/win32/mpr/mpr_Lt.rc
+++ b/dll/win32/mpr/mpr_Lt.rc
@@ -40,8 +40,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Sritis", -1, 40, 46, 50, 10 */
  LTEXT "Naudotojas", -1, 40, 66, 50, 10
  LTEXT "Slaptažodis", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "Į&rašyti šį slaptažodį (nesaugu)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Nl.rc b/dll/win32/mpr/mpr_Nl.rc
index b1c6781..b0cd0f6 100644 (file)
--- a/dll/win32/mpr/mpr_Nl.rc
+++ b/dll/win32/mpr/mpr_Nl.rc
@@ -38,8 +38,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "Gebruiker", -1, 40, 66, 50, 10
  LTEXT "Wachtwoord", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Sla dit wachtwoord op (Onveilig)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_No.rc b/dll/win32/mpr/mpr_No.rc
index 150ee50..a66399d 100644 (file)
--- a/dll/win32/mpr/mpr_No.rc
+++ b/dll/win32/mpr/mpr_No.rc
@@ -37,8 +37,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Område", -1, 40, 46, 50, 10 */
  LTEXT "Bruker", -1, 40, 66, 50, 10
  LTEXT "Passord", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "Lagre dette pa&ssordet (usikkert)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Pl.rc b/dll/win32/mpr/mpr_Pl.rc
index afdd3ba..c56faa7 100644 (file)
--- a/dll/win32/mpr/mpr_Pl.rc
+++ b/dll/win32/mpr/mpr_Pl.rc
@@ -38,8 +38,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Obszar", -1, 40, 46, 50, 10 */
  LTEXT "U¿ytkownik", -1, 40, 66, 50, 10
  LTEXT "Has³o", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Zapisz to has³o (niebezpieczne)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Pt.rc b/dll/win32/mpr/mpr_Pt.rc
index b019193..f5740cb 100644 (file)
--- a/dll/win32/mpr/mpr_Pt.rc
+++ b/dll/win32/mpr/mpr_Pt.rc
@@ -43,8 +43,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "Usuário", -1, 40, 66, 50, 10
  LTEXT "Senha", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Salvar esta senha (Inseguro)", IDC_SAVEPASSWORD,
@@ -65,8 +65,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "Utilizador", -1, 40, 66, 50, 10
  LTEXT "Senha", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Gravar esta senha (Inseguro)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Ro.rc b/dll/win32/mpr/mpr_Ro.rc
index ab7d137..fb1a974 100644 (file)
--- a/dll/win32/mpr/mpr_Ro.rc
+++ b/dll/win32/mpr/mpr_Ro.rc
@@ -37,8 +37,8 @@ FONT 8, "MS Shell Dlg"
     LTEXT "Proxy", -1, 40, 26, 50, 10
     LTEXT "Utilizator", -1, 40, 66, 50, 10
     LTEXT "Parolă", -1, 40, 86, 50, 10
-    LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
-    LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+    LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+    LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
     EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
     EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
     CHECKBOX "&Salvează această parolă (nesigur)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Ru.rc b/dll/win32/mpr/mpr_Ru.rc
index 3d17a0a..184e887 100644 (file)
--- a/dll/win32/mpr/mpr_Ru.rc
+++ b/dll/win32/mpr/mpr_Ru.rc
@@ -40,8 +40,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "Имя", -1, 40, 66, 50, 10
  LTEXT "Пароль", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Сохранить этот пароль (небезопасно!)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Si.rc b/dll/win32/mpr/mpr_Si.rc
index 8f4022e..f179078 100644 (file)
--- a/dll/win32/mpr/mpr_Si.rc
+++ b/dll/win32/mpr/mpr_Si.rc
@@ -39,8 +39,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Kraljestvo", -1, 40, 46, 50, 10 */
  LTEXT "Uporabniško ime", -1, 40, 66, 50, 10
  LTEXT "Geslo", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Shrani geslo (nezaščiteno)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Sv.rc b/dll/win32/mpr/mpr_Sv.rc
index 86d0db6..3730460 100644 (file)
--- a/dll/win32/mpr/mpr_Sv.rc
+++ b/dll/win32/mpr/mpr_Sv.rc
@@ -37,8 +37,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "Användare", -1, 40, 66, 50, 10
  LTEXT "Lösenord", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Spara detta lösenord (osäkert)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Tr.rc b/dll/win32/mpr/mpr_Tr.rc
index 0f48a15..2388106 100644 (file)
--- a/dll/win32/mpr/mpr_Tr.rc
+++ b/dll/win32/mpr/mpr_Tr.rc
@@ -37,8 +37,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "Kullanýcý", -1, 40, 66, 50, 10
  LTEXT "Parola", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "Bu parolayý &sakla (Güvensiz)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Uk.rc b/dll/win32/mpr/mpr_Uk.rc
index 67b781d..3f60e71 100644 (file)
--- a/dll/win32/mpr/mpr_Uk.rc
+++ b/dll/win32/mpr/mpr_Uk.rc
@@ -41,8 +41,8 @@ FONT 8, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "Користувач", -1, 40, 66, 50, 10
  LTEXT "Пароль", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "&Зберегти цей пароль (небезпечно)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mpr/mpr_Zh.rc b/dll/win32/mpr/mpr_Zh.rc
index 661e6b4..e8824e0 100644 (file)
--- a/dll/win32/mpr/mpr_Zh.rc
+++ b/dll/win32/mpr/mpr_Zh.rc
@@ -40,8 +40,8 @@ FONT 9, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "用户名", -1, 40, 66, 50, 10
  LTEXT "密码", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "保存密码(不安全)(&S)", IDC_SAVEPASSWORD,
@@ -67,8 +67,8 @@ FONT 9, "MS Shell Dlg"
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
  LTEXT "用戶名", -1, 40, 66, 50, 10
  LTEXT "密碼", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "", IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
  CHECKBOX "儲存密碼(不安全)(&S)", IDC_SAVEPASSWORD,

diff --git a/dll/win32/mprapi/CMakeLists.txt b/dll/win32/mprapi/CMakeLists.txt
new file mode 100644 (file)
index 0000000..de72700
--- /dev/null
+++ b/dll/win32/mprapi/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw")
+
+add_definitions(-D__WINESRC__)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(mprapi ${CMAKE_CURRENT_SOURCE_DIR}/mprapi.spec ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def)
+
+add_library(mprapi SHARED mprapi.c)
+
+set_target_properties(mprapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(mprapi
+    ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def
+    wine
+    mingw_common)
+
+add_dependencies(mprapi mprapi_def psdk)

diff --git a/dll/win32/msadp32.acm/CMakeLists.txt b/dll/win32/msadp32.acm/CMakeLists.txt
new file mode 100644 (file)
index 0000000..30652f3
--- /dev/null
+++ b/dll/win32/msadp32.acm/CMakeLists.txt
@@ -0,0 +1,28 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw")
+
+add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(-D__WINESRC__)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def
+    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/msadp32.acm.spec --filename msadp32.acm
+    DEPENDS native-winebuild)
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def PROPERTIES GENERATED TRUE)
+add_custom_target(msadp32.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def)
+
+add_library(msadp32.acm SHARED msadp32.c)
+
+set_target_properties(msadp32.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "")
+
+target_link_libraries(msadp32.acm
+    ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def
+    wine
+    -lwinmm
+    ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a
+    mingw_common
+    ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a)
+
+add_dependencies(msadp32.acm msadp32.acm_def psdk)

diff --git a/dll/win32/msafd/CMakeLists.txt b/dll/win32/msafd/CMakeLists.txt
new file mode 100644 (file)
index 0000000..50eaa5f
--- /dev/null
+++ b/dll/win32/msafd/CMakeLists.txt
@@ -0,0 +1,32 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw")
+
+add_definitions(-DUNICODE -D_UNICODE)
+
+include_directories(BEFORE include)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+
+spec2def(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.spec ${CMAKE_CURRENT_BINARY_DIR}/msafd.def)
+
+list(APPEND SOURCE
+    msafd.rc
+    misc/dllmain.c
+    misc/event.c
+    misc/helpers.c
+    misc/sndrcv.c
+    misc/stubs.c)
+
+add_library(msafd SHARED
+    ${CMAKE_CURRENT_BINARY_DIR}/msafd_msafd.h.gch
+    ${SOURCE})
+
+set_target_properties(msafd PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(msafd
+    ${CMAKE_CURRENT_BINARY_DIR}/msafd.def
+    -ladvapi32
+    -lkernel32
+    -lntdll)
+
+add_pch(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.h ${SOURCE})
+add_dependencies(msafd msafd_def psdk)

diff --git a/dll/win32/mscms/CMakeLists.txt b/dll/win32/mscms/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2c4eb40
--- /dev/null
+++ b/dll/win32/mscms/CMakeLists.txt
@@ -0,0 +1,26 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw")
+
+add_definitions(-D__WINESRC__)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(mscms ${CMAKE_CURRENT_SOURCE_DIR}/mscms.spec ${CMAKE_CURRENT_BINARY_DIR}/mscms.def)
+
+add_library(mscms SHARED
+    handle.c
+    icc.c
+    mscms_main.c
+    profile.c
+    stub.c
+    transform.c
+    version.rc)
+
+set_target_properties(mscms PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(mscms
+    ${CMAKE_CURRENT_BINARY_DIR}/mscms.def
+    wine
+    mingw_common)
+
+add_dependencies(mscms mscms_def psdk)