From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 29 Aug 2010 14:13:38 +0000 (+0000)
Subject: [CMAKE]
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~880
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=1e684c2d244c90c802020a3cf81929d6f331a485

[CMAKE]
- Add samsrv, sccbase, schannel, sensapi, serialui, shdoclc, shfolder, shlwapi, slbcsp, smdll, sndblst, snmpapi, spoolss, srclient, sxs, t2embed, tapi32, tapiui, traffic, updspapi, url, usp10 and uxtheme to build.
- Add mlang, mpr, and shell32 import libs.
- Fix shdoclc and shlwapi translations (patches will be sent upstream).
- Improve mmebuddy.

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

diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt
index 68ea84c267f..6cc133ee82b 100644
--- a/dll/win32/CMakeLists.txt
+++ b/dll/win32/CMakeLists.txt
@@ -87,4 +87,27 @@ add_subdirectory(rasdlg)
 add_subdirectory(rasman)
 add_subdirectory(resutils)
 add_subdirectory(samlib)
+add_subdirectory(samsrv)
+add_subdirectory(sccbase)
+add_subdirectory(schannel)
+add_subdirectory(sensapi)
+add_subdirectory(serialui)
+add_subdirectory(shdoclc)
+add_subdirectory(shfolder)
+add_subdirectory(shlwapi)
+add_subdirectory(slbcsp)
+add_subdirectory(smdll)
+add_subdirectory(sndblst)
+add_subdirectory(snmpapi)
+add_subdirectory(spoolss)
+add_subdirectory(srclient)
+add_subdirectory(sxs)
+add_subdirectory(t2embed)
+add_subdirectory(tapi32)
+add_subdirectory(tapiui)
+add_subdirectory(traffic)
+add_subdirectory(updspapi)
+add_subdirectory(url)
 add_subdirectory(user32)
+add_subdirectory(usp10)
+add_subdirectory(uxtheme)
\ No newline at end of file
diff --git a/dll/win32/mlang/libmlang.a b/dll/win32/mlang/libmlang.a
new file mode 100644
index 00000000000..af4c23c4c82
Binary files /dev/null and b/dll/win32/mlang/libmlang.a differ
diff --git a/dll/win32/mpr/libmpr.a b/dll/win32/mpr/libmpr.a
new file mode 100644
index 00000000000..56aad070c96
Binary files /dev/null and b/dll/win32/mpr/libmpr.a differ
diff --git a/dll/win32/samsrv/CMakeLists.txt b/dll/win32/samsrv/CMakeLists.txt
new file mode 100644
index 00000000000..013878334fb
--- /dev/null
+++ b/dll/win32/samsrv/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> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw")
+
+add_definitions(-DUNICODE -D_UNICODE)
+
+spec2def(samsrv ${CMAKE_CURRENT_SOURCE_DIR}/samsrv.spec ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def)
+
+add_library(samsrv SHARED samsrv.c samsrv.rc)
+
+set_target_properties(samsrv PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(samsrv
+    ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def
+    mingw_common)
+
+add_dependencies(samsrv samsrv_def psdk)
diff --git a/dll/win32/sccbase/CMakeLists.txt b/dll/win32/sccbase/CMakeLists.txt
new file mode 100644
index 00000000000..28fdf56a568
--- /dev/null
+++ b/dll/win32/sccbase/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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(sccbase ${CMAKE_CURRENT_SOURCE_DIR}/sccbase.spec ${CMAKE_CURRENT_BINARY_DIR}/sccbase.def)
+
+add_library(sccbase SHARED main.c)
+
+set_target_properties(sccbase PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(sccbase
+    ${CMAKE_CURRENT_BINARY_DIR}/sccbase.def
+    wine
+    mingw_common)
+
+add_dependencies(sccbase sccbase_def psdk)
diff --git a/dll/win32/schannel/CMakeLists.txt b/dll/win32/schannel/CMakeLists.txt
new file mode 100644
index 00000000000..1f8627c9bc2
--- /dev/null
+++ b/dll/win32/schannel/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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(schannel ${CMAKE_CURRENT_SOURCE_DIR}/schannel.spec ${CMAKE_CURRENT_BINARY_DIR}/schannel.def)
+
+add_library(schannel SHARED
+    lsamode.c
+    schannel_main.c
+    usermode.c
+    version.rc)
+
+set_target_properties(schannel PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(schannel
+    ${CMAKE_CURRENT_BINARY_DIR}/schannel.def
+    wine
+    -lsecur32
+    mingw_common)
+
+add_dependencies(schannel schannel_def psdk)
diff --git a/dll/win32/sensapi/CMakeLists.txt b/dll/win32/sensapi/CMakeLists.txt
new file mode 100644
index 00000000000..e7bf20bb9d7
--- /dev/null
+++ b/dll/win32/sensapi/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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(sensapi ${CMAKE_CURRENT_SOURCE_DIR}/sensapi.spec ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def)
+
+add_library(sensapi SHARED sensapi.c)
+
+set_target_properties(sensapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(sensapi
+    ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def
+    wine
+    mingw_common)
+
+add_dependencies(sensapi sensapi_def psdk)
diff --git a/dll/win32/serialui/CMakeLists.txt b/dll/win32/serialui/CMakeLists.txt
new file mode 100644
index 00000000000..0a2feb5a1ba
--- /dev/null
+++ b/dll/win32/serialui/CMakeLists.txt
@@ -0,0 +1,18 @@
+
+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(serialui ${CMAKE_CURRENT_SOURCE_DIR}/serialui.spec ${CMAKE_CURRENT_BINARY_DIR}/serialui.def)
+
+add_library(serialui SHARED serialui.c serialui.rc)
+
+set_target_properties(serialui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(serialui
+    ${CMAKE_CURRENT_BINARY_DIR}/serialui.def
+    -luser32
+    -lshlwapi
+    -lkernel32)
+
+add_dependencies(serialui serialui_def psdk)
diff --git a/dll/win32/shdoclc/CMakeLists.txt b/dll/win32/shdoclc/CMakeLists.txt
new file mode 100644
index 00000000000..fb680c089f7
--- /dev/null
+++ b/dll/win32/shdoclc/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+set(CMAKE_RC_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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(shdoclc ${CMAKE_CURRENT_SOURCE_DIR}/shdoclc.spec ${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def)
+
+add_library(shdoclc SHARED rsrc.rc)
+
+set_target_properties(shdoclc PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(shdoclc
+    ${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def
+    wine
+    mingw_common)
+
+add_dependencies(shdoclc shdoclc_def psdk)
diff --git a/dll/win32/shdoclc/Es.rc b/dll/win32/shdoclc/Es.rc
index fd2e3c7ce27..7dc968971f6 100644
--- a/dll/win32/shdoclc/Es.rc
+++ b/dll/win32/shdoclc/Es.rc
@@ -68,7 +68,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
         MENUITEM "Guardar en&lace como...",  IDM_SAVETARGET
         MENUITEM "&Imprimir enlace",         IDM_PRINTTARGET
         MENUITEM SEPARATOR
-        MENUITEM "M&ostrar imagen"           IDM_SHOWPICTURE
+        MENUITEM "M&ostrar imagen",          IDM_SHOWPICTURE
         MENUITEM "G&uardar imagen como...",  IDM_SAVEPICTURE
         MENUITEM "&Enviar por correo...",    IDM_MP_EMAILPICTURE
         MENUITEM "I&mprimir imagen...",      IDM_MP_PRINTPICTURE
@@ -132,7 +132,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
         MENUITEM "&Guardar enlace como...",     IDM_SAVETARGET
         MENUITEM "&Imprimir enlace",            IDM_PRINTTARGET
         MENUITEM SEPARATOR
-        MENUITEM "Cor&tar"                      IDM_CUT
+        MENUITEM "Cor&tar",                     IDM_CUT
         MENUITEM "&Copiar",                     IDM_COPY
         MENUITEM "C&opiar acceso directo",      IDM_COPYSHORTCUT
         MENUITEM "&Pegar",                      IDM_PASTE
@@ -160,7 +160,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
         MENUITEM "Pon&er como fondo",           IDM_SETWALLPAPER
         MENUITEM "Aña&dir al escritorio...",    IDM_SETDESKTOPITEM
         MENUITEM SEPARATOR
-        MENUITEM "Cor&tar"                      IDM_CUT
+        MENUITEM "Cor&tar",                     IDM_CUT
         MENUITEM "&Copiar",                     IDM_COPY
         MENUITEM "C&opiar acceso directo",      IDM_COPYSHORTCUT
         MENUITEM "Pe&gar",                      IDM_PASTE
@@ -224,7 +224,7 @@ IDR_BROWSE_CONTEXT_MENU MENU
     {
         MENUITEM "Desplazar &aquí",   IDM_SCROLL_HERE
         MENUITEM SEPARATOR
-        MENUITEM "&Principio"         IDM_SCROLL_TOP
+        MENUITEM "&Principio",         IDM_SCROLL_TOP
         MENUITEM "&Final",            IDM_SCROLL_BOTTOM
         MENUITEM SEPARATOR
         MENUITEM "Página a&rriba",    IDM_SCROLL_PAGEUP
diff --git a/dll/win32/shell32/libshell32.a b/dll/win32/shell32/libshell32.a
new file mode 100644
index 00000000000..7962240a926
Binary files /dev/null and b/dll/win32/shell32/libshell32.a differ
diff --git a/dll/win32/shfolder/CMakeLists.txt b/dll/win32/shfolder/CMakeLists.txt
new file mode 100644
index 00000000000..8bdba8faac9
--- /dev/null
+++ b/dll/win32/shfolder/CMakeLists.txt
@@ -0,0 +1,20 @@
+
+set(CMAKE_RC_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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(shfolder ${CMAKE_CURRENT_SOURCE_DIR}/shfolder.spec ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def)
+
+add_library(shfolder SHARED version.rc)
+
+set_target_properties(shfolder PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(shfolder
+    ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def
+    wine
+    -lshell32
+    mingw_common)
+
+add_dependencies(shfolder shfolder_def psdk)
diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt
new file mode 100644
index 00000000000..37c13770582
--- /dev/null
+++ b/dll/win32/shlwapi/CMakeLists.txt
@@ -0,0 +1,51 @@
+
+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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+remove_definitions(-D_WIN32_WINNT=0x502)
+add_definitions(-D_WIN32_WINNT=0x600)
+
+spec2def(shlwapi ${CMAKE_CURRENT_SOURCE_DIR}/shlwapi.spec ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def)
+
+add_library(shlwapi SHARED
+    assoc.c
+    clist.c
+    istream.c
+    msgbox.c
+    ordinal.c
+    path.c
+    reg.c
+    regstream.c
+    shlwapi_main.c
+    stopwatch.c
+    string.c
+    thread.c
+    url.c
+    wsprintf.c
+    shlwapi.rc)
+
+set_target_properties(shlwapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(shlwapi
+    ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def
+    wine
+    uuid
+    -luser32
+    -lgdi32
+    -ladvapi32
+    -loleaut32
+    -lole32
+    -lcomctl32
+    -lcomdlg32
+    ${REACTOS_SOURCE_DIR}/dll/win32/mpr/libmpr.a
+    ${REACTOS_SOURCE_DIR}/dll/win32/mlang/libmlang.a
+    ${REACTOS_SOURCE_DIR}/dll/win32/urlmon/liburlmon.a
+    ${REACTOS_SOURCE_DIR}/dll/win32/shell32/libshell32.a
+    -lwinmm
+    -lversion
+    mingw_common)
+
+add_dependencies(shlwapi shlwapi_def psdk)
diff --git a/dll/win32/shlwapi/shlwapi_Da.rc b/dll/win32/shlwapi/shlwapi_Da.rc
index 3bb418da2b8..7e34d55e4a2 100644
--- a/dll/win32/shlwapi/shlwapi_Da.rc
+++ b/dll/win32/shlwapi/shlwapi_Da.rc
@@ -30,10 +30,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Vis ikke denne besked igen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Annuller" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Nej" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Annuller", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Nej", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_De.rc b/dll/win32/shlwapi/shlwapi_De.rc
index 8980769933f..452e01a2e99 100644
--- a/dll/win32/shlwapi/shlwapi_De.rc
+++ b/dll/win32/shlwapi/shlwapi_De.rc
@@ -32,10 +32,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "&Diesen Dialog nicht mehr anzeigen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Abbrechen" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Nein" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Abbrechen", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Nein", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_En.rc b/dll/win32/shlwapi/shlwapi_En.rc
index 4e1d935cfca..9eb67ecd881 100644
--- a/dll/win32/shlwapi/shlwapi_En.rc
+++ b/dll/win32/shlwapi/shlwapi_En.rc
@@ -30,10 +30,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Don't show me th&is message again", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Cancel" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Yes" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Cancel", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Yes", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&No", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Es.rc b/dll/win32/shlwapi/shlwapi_Es.rc
index 8d351f680fd..ceb3cf0648d 100644
--- a/dll/win32/shlwapi/shlwapi_Es.rc
+++ b/dll/win32/shlwapi/shlwapi_Es.rc
@@ -30,10 +30,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "No volver a mostrar este &mensaje", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Aceptar" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Sí" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Aceptar", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Sí", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&No", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Fi.rc b/dll/win32/shlwapi/shlwapi_Fi.rc
index 877228f3393..947a34494d5 100644
--- a/dll/win32/shlwapi/shlwapi_Fi.rc
+++ b/dll/win32/shlwapi/shlwapi_Fi.rc
@@ -30,10 +30,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Älä näytä tätä viestiä enää", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Peruuta" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Kyllä" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Ei" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Peruuta", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Kyllä", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Ei", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Fr.rc b/dll/win32/shlwapi/shlwapi_Fr.rc
index 745b4fd0ee0..81939d916c6 100644
--- a/dll/win32/shlwapi/shlwapi_Fr.rc
+++ b/dll/win32/shlwapi/shlwapi_Fr.rc
@@ -33,10 +33,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Ne plus me montrer ce message", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Annuler" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Oui" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Non" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Annuler", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Oui", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Non", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Hu.rc b/dll/win32/shlwapi/shlwapi_Hu.rc
index 56535e8927b..92f2f417466 100644
--- a/dll/win32/shlwapi/shlwapi_Hu.rc
+++ b/dll/win32/shlwapi/shlwapi_Hu.rc
@@ -30,10 +30,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Ne jelení&tse meg ezt az üzenetet ismét", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Mégse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Mégse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_It.rc b/dll/win32/shlwapi/shlwapi_It.rc
index e7a984eaa9a..d591e10fbaa 100644
--- a/dll/win32/shlwapi/shlwapi_It.rc
+++ b/dll/win32/shlwapi/shlwapi_It.rc
@@ -30,10 +30,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Non mostrare nuovamente &questo messaggio", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Annulla" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Si" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Annulla", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Si", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&No", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Ja.rc b/dll/win32/shlwapi/shlwapi_Ja.rc
index 4b9c6ae5255..7e3e1f74c2b 100644
--- a/dll/win32/shlwapi/shlwapi_Ja.rc
+++ b/dll/win32/shlwapi/shlwapi_Ja.rc
@@ -33,10 +33,10 @@ FONT 9, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "今後はこのメッセージを表示しない(&i)", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"キャンセル(&C)" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"はい(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"いいえ(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"キャンセル(&C)", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"はい(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"いいえ(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Ko.rc b/dll/win32/shlwapi/shlwapi_Ko.rc
index 3526cac6a04..1e618e3924f 100644
--- a/dll/win32/shlwapi/shlwapi_Ko.rc
+++ b/dll/win32/shlwapi/shlwapi_Ko.rc
@@ -30,10 +30,10 @@ FONT 9, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù½Ã´Â º¸¿©ÁÖÁö ¸¶½Ã¿À(&I)", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "È®ÀÎ(&O)" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Ãë¼Ò(&C)" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "¿¹(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "¾Æ´Ï¿À(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "È®ÀÎ(&O)", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Ãë¼Ò(&C)", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "¿¹(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "¾Æ´Ï¿À(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 
diff --git a/dll/win32/shlwapi/shlwapi_Lt.rc b/dll/win32/shlwapi/shlwapi_Lt.rc
index 264f6f64eb4..78d69cb9bb1 100644
--- a/dll/win32/shlwapi/shlwapi_Lt.rc
+++ b/dll/win32/shlwapi/shlwapi_Lt.rc
@@ -33,10 +33,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Daugiau ne&rodyti šio pranešimo", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Gerai" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Atsisakyti" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Taip" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Ne" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Gerai", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Atsisakyti", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Taip", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Ne", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Nl.rc b/dll/win32/shlwapi/shlwapi_Nl.rc
index 0c9e3cb6df0..5ca2f9603b3 100644
--- a/dll/win32/shlwapi/shlwapi_Nl.rc
+++ b/dll/win32/shlwapi/shlwapi_Nl.rc
@@ -30,10 +30,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Deze boodschap &niet opnieuw tonen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Annuleren" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Nee" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Annuleren", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Nee", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_No.rc b/dll/win32/shlwapi/shlwapi_No.rc
index 9a99ac3feea..7a1e4421501 100644
--- a/dll/win32/shlwapi/shlwapi_No.rc
+++ b/dll/win32/shlwapi/shlwapi_No.rc
@@ -30,10 +30,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "&Ikke vis denne meldingen igjen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Avbryt" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Nei" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Avbryt", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Nei", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Pl.rc b/dll/win32/shlwapi/shlwapi_Pl.rc
index 8a0032c58cf..8cbad8562b0 100644
--- a/dll/win32/shlwapi/shlwapi_Pl.rc
+++ b/dll/win32/shlwapi/shlwapi_Pl.rc
@@ -31,10 +31,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Nie pokazuj w&iêcej tego komunikatu", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Anuluj" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Tak" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Nie" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Anuluj", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Tak", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Nie", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Pt.rc b/dll/win32/shlwapi/shlwapi_Pt.rc
index 9974fd673bc..70b6e65036f 100644
--- a/dll/win32/shlwapi/shlwapi_Pt.rc
+++ b/dll/win32/shlwapi/shlwapi_Pt.rc
@@ -31,10 +31,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Não &me mostre essa mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Não" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
@@ -47,10 +47,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Não &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Não" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 
diff --git a/dll/win32/shlwapi/shlwapi_Ro.rc b/dll/win32/shlwapi/shlwapi_Ro.rc
index 800f25971e9..74e52d84880 100644
--- a/dll/win32/shlwapi/shlwapi_Ro.rc
+++ b/dll/win32/shlwapi/shlwapi_Ro.rc
@@ -31,10 +31,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Nu &afișa din nou acest mesaj", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Renunță" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Da" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Nu" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Renunță", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Da", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Nu", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Ru.rc b/dll/win32/shlwapi/shlwapi_Ru.rc
index 42a5c38dd73..42f097cab6e 100644
--- a/dll/win32/shlwapi/shlwapi_Ru.rc
+++ b/dll/win32/shlwapi/shlwapi_Ru.rc
@@ -33,10 +33,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Больше не &показывать это сообщение", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"О&тменить" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Да" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Нет" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"О&тменить", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Да", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Нет", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Si.rc b/dll/win32/shlwapi/shlwapi_Si.rc
index 820b6ce5ed1..1837d1cd2d0 100644
--- a/dll/win32/shlwapi/shlwapi_Si.rc
+++ b/dll/win32/shlwapi/shlwapi_Si.rc
@@ -32,10 +32,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Tega sporočila ne &kaži več", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&V redu" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Prekliči" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Da" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Ne" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&V redu", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Prekliči", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Da", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Ne", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Sk.rc b/dll/win32/shlwapi/shlwapi_Sk.rc
index c44ca3f39fa..2533d95c800 100644
--- a/dll/win32/shlwapi/shlwapi_Sk.rc
+++ b/dll/win32/shlwapi/shlwapi_Sk.rc
@@ -30,10 +30,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Nabudúce toto dialógové okno nezo&brazova", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Zruši" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"Án&o" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Nie" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Zruši", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"Án&o", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Nie", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Sv.rc b/dll/win32/shlwapi/shlwapi_Sv.rc
index 6a0d52bc996..2aa19b9617d 100644
--- a/dll/win32/shlwapi/shlwapi_Sv.rc
+++ b/dll/win32/shlwapi/shlwapi_Sv.rc
@@ -30,10 +30,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Visa inte &det här meddelandet igen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Avbryt" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Nej" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Avbryt", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Nej", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Tr.rc b/dll/win32/shlwapi/shlwapi_Tr.rc
index 58515962719..437ad28b283 100644
--- a/dll/win32/shlwapi/shlwapi_Tr.rc
+++ b/dll/win32/shlwapi/shlwapi_Tr.rc
@@ -30,10 +30,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "Bu iletiyi bir daha &gösterme", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Tamam" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Ýptal" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Evet" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Hayýr" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Tamam", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Ýptal", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Evet", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Hayýr", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Uk.rc b/dll/win32/shlwapi/shlwapi_Uk.rc
index c14a7ce13dc..485f7cc02b7 100644
--- a/dll/win32/shlwapi/shlwapi_Uk.rc
+++ b/dll/win32/shlwapi/shlwapi_Uk.rc
@@ -30,10 +30,10 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "&Á³ëüøå íå ïîêàçóâàòè öå ïîâ³äîìëåííÿ", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Ñêàñóâàòè" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Òàê" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&ͳ" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Ñêàñóâàòè", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Òàê", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&ͳ", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/shlwapi/shlwapi_Zh.rc b/dll/win32/shlwapi/shlwapi_Zh.rc
index 0a1d9a62bf2..83c2c08ecaa 100644
--- a/dll/win32/shlwapi/shlwapi_Zh.rc
+++ b/dll/win32/shlwapi/shlwapi_Zh.rc
@@ -33,10 +33,10 @@ FONT 9, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "不要再显示这个讯息", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"确定(&O)" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"取消(&C)" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"是(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"否(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"确定(&O)", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"取消(&C)", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"是(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"否(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
@@ -57,10 +57,10 @@ FONT 9, "MS Shell Dlg"
  LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
  LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
  CHECKBOX "不要再顯示這個訊息", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"確定(&O)" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"取消(&C)" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"是(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"否(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"確定(&O)", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"取消(&C)", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"是(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"否(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
diff --git a/dll/win32/slbcsp/CMakeLists.txt b/dll/win32/slbcsp/CMakeLists.txt
new file mode 100644
index 00000000000..8237a72d4e1
--- /dev/null
+++ b/dll/win32/slbcsp/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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(slbcsp ${CMAKE_CURRENT_SOURCE_DIR}/slbcsp.spec ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def)
+
+add_library(slbcsp SHARED main.c)
+
+set_target_properties(slbcsp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(slbcsp
+    ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def
+    wine
+    mingw_common)
+
+add_dependencies(slbcsp slbcsp_def psdk)
diff --git a/dll/win32/smdll/CMakeLists.txt b/dll/win32/smdll/CMakeLists.txt
new file mode 100644
index 00000000000..740ef85f824
--- /dev/null
+++ b/dll/win32/smdll/CMakeLists.txt
@@ -0,0 +1,18 @@
+
+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>")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+
+spec2def(smdll ${CMAKE_CURRENT_SOURCE_DIR}/smdll.spec ${CMAKE_CURRENT_BINARY_DIR}/smdll.def)
+
+add_library(smdll SHARED
+    dllmain.c
+    query.c
+    smdll.rc)
+
+target_link_libraries(smdll
+    ${CMAKE_CURRENT_BINARY_DIR}/smdll.def
+    smlib
+    ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a)
+
+add_dependencies(smdll smdll_def psdk)
diff --git a/dll/win32/sndblst/CMakeLists.txt b/dll/win32/sndblst/CMakeLists.txt
new file mode 100644
index 00000000000..09c45c524a2
--- /dev/null
+++ b/dll/win32/sndblst/CMakeLists.txt
@@ -0,0 +1,25 @@
+
+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>")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
+
+add_definitions(-DUNICODE -D_UNICODE)
+add_definitions(-DDEBUG_NT4)
+
+spec2def(sndblst ${CMAKE_CURRENT_SOURCE_DIR}/sndblst.spec ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def)
+
+add_library(sndblst SHARED sndblst.c)
+
+set_target_properties(sndblst PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(sndblst
+    ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def
+    mment4
+    mmebuddy
+    -luser32
+    -lwinmm
+    -ladvapi32
+    -lkernel32  
+    ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a)
+
+add_dependencies(sndblst sndblst_def psdk)
diff --git a/dll/win32/snmpapi/CMakeLists.txt b/dll/win32/snmpapi/CMakeLists.txt
new file mode 100644
index 00000000000..80aa5976384
--- /dev/null
+++ b/dll/win32/snmpapi/CMakeLists.txt
@@ -0,0 +1,22 @@
+
+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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+remove_definitions(-D_WIN32_WINNT=0x502)
+add_definitions(-D_WIN32_WINNT=0x600)
+
+spec2def(snmpapi ${CMAKE_CURRENT_SOURCE_DIR}/snmpapi.spec ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def)
+
+add_library(snmpapi SHARED main.c snmpapi.rc)
+
+set_target_properties(snmpapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(snmpapi
+    ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def
+    wine
+    mingw_common)
+
+add_dependencies(snmpapi snmpapi_def psdk)
diff --git a/dll/win32/spoolss/CMakeLists.txt b/dll/win32/spoolss/CMakeLists.txt
new file mode 100644
index 00000000000..c4ed15008c6
--- /dev/null
+++ b/dll/win32/spoolss/CMakeLists.txt
@@ -0,0 +1,20 @@
+
+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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(spoolss ${CMAKE_CURRENT_SOURCE_DIR}/spoolss.spec ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def)
+
+add_library(spoolss SHARED spoolss_main.c router.c)
+
+set_target_properties(spoolss PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(spoolss
+    ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def
+    wine
+    -lwinspool
+    mingw_common)
+
+add_dependencies(spoolss spoolss_def psdk)
diff --git a/dll/win32/srclient/CMakeLists.txt b/dll/win32/srclient/CMakeLists.txt
new file mode 100644
index 00000000000..25ad1b75fd0
--- /dev/null
+++ b/dll/win32/srclient/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+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>")
+
+spec2def(srclient ${CMAKE_CURRENT_SOURCE_DIR}/srclient.spec ${CMAKE_CURRENT_BINARY_DIR}/srclient.def)
+
+add_library(srclient SHARED srclient_main.c)
+
+set_target_properties(srclient PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(srclient
+    ${CMAKE_CURRENT_BINARY_DIR}/srclient.def
+    -lkernel32
+    -lntdll)
+
+add_dependencies(srclient srclient_def psdk)
diff --git a/dll/win32/sxs/CMakeLists.txt b/dll/win32/sxs/CMakeLists.txt
new file mode 100644
index 00000000000..aa778eb486b
--- /dev/null
+++ b/dll/win32/sxs/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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(sxs ${CMAKE_CURRENT_SOURCE_DIR}/sxs.spec ${CMAKE_CURRENT_BINARY_DIR}/sxs.def)
+
+add_library(sxs SHARED sxs.c)
+
+set_target_properties(sxs PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(sxs
+    ${CMAKE_CURRENT_BINARY_DIR}/sxs.def
+    wine
+    mingw_common)
+
+add_dependencies(sxs sxs_def psdk)
diff --git a/dll/win32/t2embed/CMakeLists.txt b/dll/win32/t2embed/CMakeLists.txt
new file mode 100644
index 00000000000..c8fee7ee6f0
--- /dev/null
+++ b/dll/win32/t2embed/CMakeLists.txt
@@ -0,0 +1,23 @@
+
+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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-DUNICODE -D_UNICODE)
+
+spec2def(t2embed ${CMAKE_CURRENT_SOURCE_DIR}/t2embed.spec ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def)
+
+add_library(t2embed SHARED t2embed.c t2embed.rc)
+
+set_target_properties(t2embed PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(t2embed
+    ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def
+    wine
+    -lgdi32
+    -luser32
+    -ladvapi32
+    -lversion
+    mingw_common)
+
+add_dependencies(t2embed t2embed_def psdk)
diff --git a/dll/win32/tapi32/CMakeLists.txt b/dll/win32/tapi32/CMakeLists.txt
new file mode 100644
index 00000000000..b0980ba4901
--- /dev/null
+++ b/dll/win32/tapi32/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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(tapi32 ${CMAKE_CURRENT_SOURCE_DIR}/tapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def)
+
+add_library(tapi32 SHARED
+    assisted.c
+    internal.c
+    line.c
+    phone.c)
+
+set_target_properties(tapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(tapi32
+    ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def
+    wine
+    -ladvapi32
+    mingw_common)
+
+add_dependencies(tapi32 tapi32_def psdk)
diff --git a/dll/win32/tapiui/CMakeLists.txt b/dll/win32/tapiui/CMakeLists.txt
new file mode 100644
index 00000000000..641d658e24a
--- /dev/null
+++ b/dll/win32/tapiui/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+set(CMAKE_RC_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_library(tapiui SHARED tapiui.rc)
+
+set_target_properties(tapiui PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+add_dependencies(tapiui psdk)
diff --git a/dll/win32/traffic/CMakeLists.txt b/dll/win32/traffic/CMakeLists.txt
new file mode 100644
index 00000000000..1e3ba439d19
--- /dev/null
+++ b/dll/win32/traffic/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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(traffic ${CMAKE_CURRENT_SOURCE_DIR}/traffic.spec ${CMAKE_CURRENT_BINARY_DIR}/traffic.def)
+
+add_library(traffic SHARED traffic_main.c)
+
+set_target_properties(traffic PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(traffic
+    ${CMAKE_CURRENT_BINARY_DIR}/traffic.def
+    wine
+    mingw_common)
+
+add_dependencies(traffic traffic_def psdk)
diff --git a/dll/win32/updspapi/CMakeLists.txt b/dll/win32/updspapi/CMakeLists.txt
new file mode 100644
index 00000000000..efa8946f8b4
--- /dev/null
+++ b/dll/win32/updspapi/CMakeLists.txt
@@ -0,0 +1,20 @@
+
+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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(updspapi ${CMAKE_CURRENT_SOURCE_DIR}/updspapi.spec ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def)
+
+add_library(updspapi SHARED main.c)
+
+set_target_properties(updspapi PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(updspapi
+    ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def
+    wine
+    -lsetupapi
+    mingw_common)
+
+add_dependencies(updspapi updspapi_def psdk)
diff --git a/dll/win32/url/CMakeLists.txt b/dll/win32/url/CMakeLists.txt
new file mode 100644
index 00000000000..a9ad5dbcf2a
--- /dev/null
+++ b/dll/win32/url/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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(url ${CMAKE_CURRENT_SOURCE_DIR}/url.spec ${CMAKE_CURRENT_BINARY_DIR}/url.def)
+
+add_library(url SHARED url_main.c)
+
+set_target_properties(url PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(url
+    ${CMAKE_CURRENT_BINARY_DIR}/url.def
+    wine
+    -lshell32
+    -lshlwapi
+    mingw_common)
+
+add_dependencies(url url_def psdk)
diff --git a/dll/win32/urlmon/liburlmon.a b/dll/win32/urlmon/liburlmon.a
new file mode 100644
index 00000000000..897ce0ec144
Binary files /dev/null and b/dll/win32/urlmon/liburlmon.a differ
diff --git a/dll/win32/usp10/CMakeLists.txt b/dll/win32/usp10/CMakeLists.txt
new file mode 100644
index 00000000000..bda828f015a
--- /dev/null
+++ b/dll/win32/usp10/CMakeLists.txt
@@ -0,0 +1,25 @@
+
+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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(usp10 ${CMAKE_CURRENT_SOURCE_DIR}/usp10.spec ${CMAKE_CURRENT_BINARY_DIR}/usp10.def)
+
+add_library(usp10 SHARED
+    bidi.c
+    usp10.c
+    mirror.c
+    shape.c
+    shaping.c)
+
+set_target_properties(usp10 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(usp10
+    ${CMAKE_CURRENT_BINARY_DIR}/usp10.def
+    wine
+    ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a
+    mingw_common)
+
+add_dependencies(usp10 usp10_def psdk)
diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt
new file mode 100644
index 00000000000..277e141ad03
--- /dev/null
+++ b/dll/win32/uxtheme/CMakeLists.txt
@@ -0,0 +1,33 @@
+
+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")
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_definitions(-D__WINESRC__)
+
+spec2def(uxtheme ${CMAKE_CURRENT_SOURCE_DIR}/uxtheme.spec ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def)
+
+add_library(uxtheme SHARED
+    buffer.c
+    draw.c
+    main.c
+    metric.c
+    msstyles.c
+    property.c
+    stylemap.c
+    system.c
+    uxini.c
+    version.rc)
+
+set_target_properties(uxtheme PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+
+target_link_libraries(uxtheme
+    ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def
+    wine
+    -luser32
+    -ladvapi32
+    -lgdi32
+    -lmsimg32
+    mingw_common)
+
+add_dependencies(uxtheme uxtheme_def psdk)
diff --git a/lib/drivers/sound/mmebuddy/CMakeLists.txt b/lib/drivers/sound/mmebuddy/CMakeLists.txt
index f6e361e0f58..6e6621cdd9d 100644
--- a/lib/drivers/sound/mmebuddy/CMakeLists.txt
+++ b/lib/drivers/sound/mmebuddy/CMakeLists.txt
@@ -4,7 +4,25 @@ add_definitions(-DNDEBUG=1)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 
-file(GLOB_RECURSE SOURCE "*.c")
+list(APPEND SOURCE
+    capabilities.c
+    devicelist.c
+    deviceinstance.c
+    functiontable.c
+    mmewrap.c
+    reentrancy.c
+    utility.c
+    kernel.c
+    thread.c
+    auxiliary/auxMessage.c
+    midi/midMessage.c
+    midi/modMessage.c
+    mixer/mxdMessage.c
+    wave/widMessage.c
+    wave/wodMessage.c
+    wave/format.c
+    wave/header.c
+    wave/streaming.c)
 
 add_library(mmebuddy ${SOURCE})
 add_dependencies(mmebuddy psdk)