[MSACM32.DRV]

* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62911

diff --git a/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt b/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
index 407d47d..34891e2 100644 (file)
--- a/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
+++ b/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
@@ -1,18 +1,14 @@
 
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(msacm32.drv msacm32.drv.spec)
 
-add_library(msacm32.drv SHARED wavemap.c wavemap.rc
+add_library(msacm32.drv SHARED
+    wavemap.c
+    wavemap.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
 
 set_module_type(msacm32.drv win32dll UNICODE)
-
 set_target_properties(msacm32.drv PROPERTIES SUFFIX "")
-
 target_link_libraries(msacm32.drv wine)
-
-add_importlibs(msacm32.drv msvcrt msacm32 user32 winmm advapi32 kernel32 ntdll)
-add_dependencies(msacm32.drv psdk)
+add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET msacm32.drv DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c b/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c
index c2b2a06..8839821 100644 (file)
--- a/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c
+++ b/reactos/dll/win32/msacm32/msacm32.drv/wavemap.c
@@ -337,7 +337,7 @@ static      DWORD   wodWrite(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2)
     if (ash->cbSrcLength > ash->cbSrcLengthUsed)
         FIXME("Not all src buffer has been written, expect bogus sound\n");
     else if (ash->cbSrcLength < ash->cbSrcLengthUsed)
-        ERR("CoDec has read more data than it is allowed to\n");
+        ERR("Codec has read more data than it is allowed to\n");
 
     if (ash->cbDstLengthUsed == 0) {
         /* something went wrong in decoding */
@@ -675,7 +675,7 @@ static void CALLBACK widCallback(HWAVEIN hWave, UINT uMsg, DWORD_PTR dwInstance,
        return;
     }
 
-    if (hWave != wim->u.in.hInnerWave && uMsg != WIM_OPEN)
+    if (uMsg != WIM_OPEN && hWave != wim->u.in.hInnerWave)
        ERR("Shouldn't happen (%p %p)\n", hWave, wim->u.in.hInnerWave);
 
     switch (uMsg) {

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 9b5b876..0478b13 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -48,181 +48,182 @@ reactos/dll/directx/wine/qedit          # Synced to Wine-1.7.17
 reactos/dll/directx/wine/quartz         # Synced to Wine-1.7.17
 reactos/dll/directx/wine/wined3d        # Synced to Wine-1.7.17
 
-reactos/dll/win32/activeds         # Synced to Wine-1.7.1
-reactos/dll/win32/actxprxy         # Synced to Wine-1.7.17
-reactos/dll/win32/advpack          # Synced to Wine-1.7.1
-reactos/dll/win32/atl              # Synced to Wine-1.7.1
-reactos/dll/win32/atl100           # Synced to Wine-1.7.1
-reactos/dll/win32/atl80            # Synced to Wine-1.7.1
-reactos/dll/win32/avifil32         # Synced to Wine-1.7.17
-reactos/dll/win32/bcrypt           # Synced to Wine-1.7.17
-reactos/dll/win32/browseui         # Out of sync
-reactos/dll/win32/cabinet          # Synced to Wine-1.7.17
-reactos/dll/win32/clusapi          # Synced to Wine-1.7.1
-reactos/dll/win32/comcat           # Synced to Wine-1.7.1
-reactos/dll/win32/comctl32         # Synced to Wine 1.7.17
-reactos/dll/win32/comdlg32         # Synced to Wine 1.7.17
-reactos/dll/win32/compstui         # Synced to Wine-1.7.1
-reactos/dll/win32/credui           # Synced to Wine-1.7.1
-reactos/dll/win32/crypt32          # Synced to Wine-1.7.17
-reactos/dll/win32/cryptdlg         # Synced to Wine-1.7.1
-reactos/dll/win32/cryptdll         # Synced to Wine-1.7.1
-reactos/dll/win32/cryptnet         # Synced to Wine-1.7.17
-reactos/dll/win32/cryptui          # Synced to Wine-1.7.1
-reactos/dll/win32/dbghelp          # Synced to Wine-1.7.1
-reactos/dll/win32/dciman32         # Synced to Wine-1.7.1
-reactos/dll/win32/dwmapi           # Synced to Wine-1.7.17
-reactos/dll/win32/faultrep         # Synced to Wine-1.7.1
-reactos/dll/win32/fusion           # Synced to Wine-1.7.1
-reactos/dll/win32/gdiplus          # Synced to Wine-1.7.17
-reactos/dll/win32/hhctrl.ocx       # Synced to Wine-1.7.17
-reactos/dll/win32/hlink            # Synced to Wine-1.7.17
-reactos/dll/win32/hnetcfg          # Synced to Wine-1.7.1
-reactos/dll/win32/httpapi          # Synced to Wine-1.7.1
-reactos/dll/win32/iccvid           # Synced to Wine-1.7.1
-reactos/dll/win32/icmp             # Out of sync
-reactos/dll/win32/ieframe          # Synced to Wine-1.7.1
-reactos/dll/win32/imaadp32.acm     # Synced to Wine-1.7.1
-reactos/dll/win32/imagehlp         # Synced to Wine-1.7.17
-reactos/dll/win32/imm32            # Synced to Wine-1.7.1
-reactos/dll/win32/inetcomm         # Synced to Wine-1.7.17
-reactos/dll/win32/inetmib1         # Synced to Wine-1.7.1
-reactos/dll/win32/initpki          # Synced to Wine-1.7.1
-reactos/dll/win32/inseng           # Synced to Wine-1.7.1
-reactos/dll/win32/iphlpapi         # Out of sync
-reactos/dll/win32/itircl           # Synced to Wine-1.7.1
-reactos/dll/win32/itss             # Synced to Wine-1.7.17
-reactos/dll/win32/jscript          # Synced to Wine-1.7.17
-reactos/dll/win32/loadperf         # Synced to Wine-1.7.1
-reactos/dll/win32/localspl         # Synced to Wine-1.7.17
-reactos/dll/win32/localui          # Synced to Wine-1.7.1
-reactos/dll/win32/lz32             # Synced to Wine-1.7.1
-reactos/dll/win32/mapi32           # Synced to Wine-1.7.17
-reactos/dll/win32/mciavi32         # Synced to Wine-1.7.1
-reactos/dll/win32/mcicda           # Synced to Wine-1.7.1
-reactos/dll/win32/mciqtz32         # Synced to Wine-1.7.17
-reactos/dll/win32/mciseq           # Synced to Wine-1.7.1
-reactos/dll/win32/mciwave          # Synced to Wine-1.7.1
-reactos/dll/win32/mlang            # Synced to Wine-1.7.17
-reactos/dll/win32/mmdevapi         # Synced to Wine-1.7.1
-reactos/dll/win32/mpr              # Synced to Wine-1.7.1
-reactos/dll/win32/mprapi           # Synced to Wine-1.7.1
-reactos/dll/win32/msacm32          # Synced to Wine-1.7.17
-reactos/dll/win32/msadp32.acm      # Synced to Wine-1.7.1
-reactos/dll/win32/mscat32          # Synced to Wine-1.7.1
-reactos/dll/win32/mscms            # Synced to Wine-1.7.1
-reactos/dll/win32/mscoree          # Synced to Wine-1.5.4
-reactos/dll/win32/msctf            # Synced to Wine-1.7.1
-reactos/dll/win32/msftedit         # Synced to Wine-1.7.1
-reactos/dll/win32/msg711.acm       # Synced to Wine-1.7.1
-reactos/dll/win32/msgsm32.acm      # Synced to Wine-1.7.1
-reactos/dll/win32/mshtml           # Synced to Wine-1.7.1
-reactos/dll/win32/mshtml.tlb       # Synced to Wine-1.7.1
-reactos/dll/win32/msi              # Synced to Wine-1.7.1
-reactos/dll/win32/msimg32          # Synced to Wine-1.7.1
-reactos/dll/win32/msimtf           # Synced to Wine-1.7.1
-reactos/dll/win32/msisip           # Synced to Wine-1.7.1
-reactos/dll/win32/msisys.ocx       # Synced to Wine-1.7.1
-reactos/dll/win32/msnet32          # Synced to Wine-1.7.1
-reactos/dll/win32/msrle32          # Synced to Wine-1.7.1
-reactos/dll/win32/mssign32         # Synced to Wine-1.7.1
-reactos/dll/win32/mssip32          # Synced to Wine-1.7.1
-reactos/dll/win32/mstask           # Synced to Wine-1.7.1
-reactos/dll/win32/msvcrt20         # Out of sync
-reactos/dll/win32/msvcrt40         # Out of sync
-reactos/dll/win32/msvfw32          # Synced to Wine-1.7.1
-reactos/dll/win32/msvidc32         # Synced to Wine-1.7.1
-reactos/dll/win32/msxml            # Synced to Wine-1.7.1
-reactos/dll/win32/msxml2           # Synced to Wine-1.7.1
-reactos/dll/win32/msxml3           # Synced to Wine-1.7.1
-reactos/dll/win32/msxml4           # Synced to Wine-1.7.1
-reactos/dll/win32/msxml6           # Synced to Wine-1.7.1
-reactos/dll/win32/nddeapi          # Synced to Wine-1.7.1
-reactos/dll/win32/netapi32         # Forked at Wine-1.3.34
-reactos/dll/win32/ntdsapi          # Synced to Wine-1.7.1
-reactos/dll/win32/ntprint          # Synced to Wine-1.7.1
-reactos/dll/win32/objsel           # Synced to Wine-1.7.1
-reactos/dll/win32/odbc32           # Synced to Wine-1.7.1. Depends on port of Linux ODBC.
-reactos/dll/win32/odbccp32         # Synced to Wine-1.7.1
-reactos/dll/win32/ole32            # Synced to Wine-1.7.1
-reactos/dll/win32/oleacc           # Synced to Wine-1.7.1
-reactos/dll/win32/oleaut32         # Synced to Wine-1.7.1
-reactos/dll/win32/olecli32         # Synced to Wine-1.7.1
-reactos/dll/win32/oledlg           # Synced to Wine-1.7.1
-reactos/dll/win32/olepro32         # Synced to Wine-1.7.1
-reactos/dll/win32/olesvr32         # Synced to Wine-1.7.1
-reactos/dll/win32/olethk32         # Synced to Wine-1.7.1
-reactos/dll/win32/pdh              # Synced to Wine-1.7.1
-reactos/dll/win32/pidgen           # Synced to Wine-1.7.1
-reactos/dll/win32/powrprof         # Forked at Wine-1.0rc5
-reactos/dll/win32/printui          # Synced to Wine-1.7.1
-reactos/dll/win32/propsys          # Synced to Wine-1.7.1
-reactos/dll/win32/pstorec          # Synced to Wine-1.7.1
-reactos/dll/win32/qmgr             # Synced to Wine-1.7.1
-reactos/dll/win32/qmgrprxy         # Synced to Wine-1.7.1
-reactos/dll/win32/query            # Synced to Wine-1.7.1
-reactos/dll/win32/rasapi32         # Synced to Wine-1.7.1
-reactos/dll/win32/resutils         # Synced to Wine-1.7.1
-reactos/dll/win32/riched20         # Synced to Wine-1.7.1
-reactos/dll/win32/riched32         # Synced to Wine-1.7.1
-reactos/dll/win32/rpcrt4           # Synced to Wine-1.7.1
-reactos/dll/win32/rsabase          # Synced to Wine-1.7.1
-reactos/dll/win32/rsaenh           # Synced to Wine-1.7.17
-reactos/dll/win32/sccbase          # Synced to Wine-1.7.1
-reactos/dll/win32/schannel         # Synced to Wine-1.7.1
-reactos/dll/win32/scrrun           # Synced to Wine-1.7.1
-reactos/dll/win32/secur32          # Forked
-reactos/dll/win32/security         # Forked (different .spec)
-reactos/dll/win32/sensapi          # Synced to Wine-1.7.1
-reactos/dll/win32/setupapi         # Forked at Wine-20050524
-reactos/dll/win32/shdoclc          # Synced to Wine-1.7.1
-reactos/dll/win32/shdocvw          # Synced to Wine-1.7.1
-reactos/dll/win32/shell32          # Forked at Wine-20071011
-reactos/dll/win32/shfolder         # Synced to Wine-1.7.1
-reactos/dll/win32/shlwapi          # Synced to Wine-1.7.1
-reactos/dll/win32/slbcsp           # Synced to Wine-1.7.1
-reactos/dll/win32/snmpapi          # Synced to Wine-1.7.1
-reactos/dll/win32/softpub          # Synced to Wine-1.7.1
-reactos/dll/win32/spoolss          # Synced to Wine-1.7.1
-reactos/dll/win32/stdole2.tlb      # Synced to Wine-1.7.1
-reactos/dll/win32/stdole32.tlb     # Synced to Wine-1.7.1
-reactos/dll/win32/sti              # Synced to Wine-1.7.1
-reactos/dll/win32/sxs              # Synced to Wine-1.7.1
-reactos/dll/win32/tapi32           # Synced to Wine-1.7.1
-reactos/dll/win32/traffic          # Synced to Wine-1.7.1
-reactos/dll/win32/twain_32         # Synced to Wine-1.7.1
-reactos/dll/win32/unicows          # Synced to Wine-1.3.32 (Win9x only, why do we need this?!)
-reactos/dll/win32/updspapi         # Synced to Wine-1.7.1
-reactos/dll/win32/url              # Synced to Wine-1.7.1
-reactos/dll/win32/urlmon           # Synced to Wine-1.7.1
-reactos/dll/win32/usp10            # Synced to Wine-1.7.14
-reactos/dll/win32/uxtheme          # Forked
-reactos/dll/win32/vbscript         # Synced to Wine-1.7.1
-reactos/dll/win32/version          # Synced to Wine-1.7.1
-reactos/dll/win32/wbemdisp         # Synced to Wine-1.7.1
-reactos/dll/win32/wbemprox         # Synced to Wine-1.7.2
-reactos/dll/win32/wer              # Autosync
-reactos/dll/win32/windowscodecs    # Synced to Wine-1.7.1
-reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.1
-reactos/dll/win32/winemp3.acm      # Synced to Wine-1.7.1
-reactos/dll/win32/wing32           # Out of sync
-reactos/dll/win32/winhttp          # Synced to Wine-1.7.1
-reactos/dll/win32/wininet          # Synced to Wine-1.7.1
-reactos/dll/win32/winmm            # Forked at Wine-20050628
-reactos/dll/win32/winmm/midimap    # Forked at Wine-20050628
-reactos/dll/win32/winmm/wavemap    # Forked at Wine-20050628
-reactos/dll/win32/wintrust         # Synced to Wine-1.7.1
-reactos/dll/win32/wldap32          # Synced to Wine-1.7.1
-reactos/dll/win32/wmi              # Synced to Wine-1.7.1
-reactos/dll/win32/wtsapi32         # Synced to Wine-1.7.1
-reactos/dll/win32/wuapi            # Synced to Wine-1.7.1
-reactos/dll/win32/xinput1_1        # Synced to Wine-1.7.1
-reactos/dll/win32/xinput1_2        # Synced to Wine-1.7.1
-reactos/dll/win32/xinput1_3        # Synced to Wine-1.7.1
-reactos/dll/win32/xinput9_1_0      # Synced to Wine-1.7.1
-reactos/dll/win32/xmllite          # Synced to Wine-1.7.17
+reactos/dll/win32/activeds            # Synced to Wine-1.7.1
+reactos/dll/win32/actxprxy            # Synced to Wine-1.7.17
+reactos/dll/win32/advpack             # Synced to Wine-1.7.1
+reactos/dll/win32/atl                 # Synced to Wine-1.7.1
+reactos/dll/win32/atl100              # Synced to Wine-1.7.1
+reactos/dll/win32/atl80               # Synced to Wine-1.7.1
+reactos/dll/win32/avifil32            # Synced to Wine-1.7.17
+reactos/dll/win32/bcrypt              # Synced to Wine-1.7.17
+reactos/dll/win32/browseui            # Out of sync
+reactos/dll/win32/cabinet             # Synced to Wine-1.7.17
+reactos/dll/win32/clusapi             # Synced to Wine-1.7.1
+reactos/dll/win32/comcat              # Synced to Wine-1.7.1
+reactos/dll/win32/comctl32            # Synced to Wine 1.7.17
+reactos/dll/win32/comdlg32            # Synced to Wine 1.7.17
+reactos/dll/win32/compstui            # Synced to Wine-1.7.1
+reactos/dll/win32/credui              # Synced to Wine-1.7.1
+reactos/dll/win32/crypt32             # Synced to Wine-1.7.17
+reactos/dll/win32/cryptdlg            # Synced to Wine-1.7.1
+reactos/dll/win32/cryptdll            # Synced to Wine-1.7.1
+reactos/dll/win32/cryptnet            # Synced to Wine-1.7.17
+reactos/dll/win32/cryptui             # Synced to Wine-1.7.1
+reactos/dll/win32/dbghelp             # Synced to Wine-1.7.1
+reactos/dll/win32/dciman32            # Synced to Wine-1.7.1
+reactos/dll/win32/dwmapi              # Synced to Wine-1.7.17
+reactos/dll/win32/faultrep            # Synced to Wine-1.7.1
+reactos/dll/win32/fusion              # Synced to Wine-1.7.1
+reactos/dll/win32/gdiplus             # Synced to Wine-1.7.17
+reactos/dll/win32/hhctrl.ocx          # Synced to Wine-1.7.17
+reactos/dll/win32/hlink               # Synced to Wine-1.7.17
+reactos/dll/win32/hnetcfg             # Synced to Wine-1.7.1
+reactos/dll/win32/httpapi             # Synced to Wine-1.7.1
+reactos/dll/win32/iccvid              # Synced to Wine-1.7.1
+reactos/dll/win32/icmp                # Out of sync
+reactos/dll/win32/ieframe             # Synced to Wine-1.7.1
+reactos/dll/win32/imaadp32.acm        # Synced to Wine-1.7.1
+reactos/dll/win32/imagehlp            # Synced to Wine-1.7.17
+reactos/dll/win32/imm32               # Synced to Wine-1.7.1
+reactos/dll/win32/inetcomm            # Synced to Wine-1.7.17
+reactos/dll/win32/inetmib1            # Synced to Wine-1.7.1
+reactos/dll/win32/initpki             # Synced to Wine-1.7.1
+reactos/dll/win32/inseng              # Synced to Wine-1.7.1
+reactos/dll/win32/iphlpapi            # Out of sync
+reactos/dll/win32/itircl              # Synced to Wine-1.7.1
+reactos/dll/win32/itss                # Synced to Wine-1.7.17
+reactos/dll/win32/jscript             # Synced to Wine-1.7.17
+reactos/dll/win32/loadperf            # Synced to Wine-1.7.1
+reactos/dll/win32/localspl            # Synced to Wine-1.7.17
+reactos/dll/win32/localui             # Synced to Wine-1.7.1
+reactos/dll/win32/lz32                # Synced to Wine-1.7.1
+reactos/dll/win32/mapi32              # Synced to Wine-1.7.17
+reactos/dll/win32/mciavi32            # Synced to Wine-1.7.1
+reactos/dll/win32/mcicda              # Synced to Wine-1.7.1
+reactos/dll/win32/mciqtz32            # Synced to Wine-1.7.17
+reactos/dll/win32/mciseq              # Synced to Wine-1.7.1
+reactos/dll/win32/mciwave             # Synced to Wine-1.7.1
+reactos/dll/win32/mlang               # Synced to Wine-1.7.17
+reactos/dll/win32/mmdevapi            # Synced to Wine-1.7.1
+reactos/dll/win32/mpr                 # Synced to Wine-1.7.1
+reactos/dll/win32/mprapi              # Synced to Wine-1.7.1
+reactos/dll/win32/msacm32             # Synced to Wine-1.7.17
+reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.17
+reactos/dll/win32/msadp32.acm         # Synced to Wine-1.7.1
+reactos/dll/win32/mscat32             # Synced to Wine-1.7.1
+reactos/dll/win32/mscms               # Synced to Wine-1.7.1
+reactos/dll/win32/mscoree             # Synced to Wine-1.5.4
+reactos/dll/win32/msctf               # Synced to Wine-1.7.1
+reactos/dll/win32/msftedit            # Synced to Wine-1.7.1
+reactos/dll/win32/msg711.acm          # Synced to Wine-1.7.1
+reactos/dll/win32/msgsm32.acm         # Synced to Wine-1.7.1
+reactos/dll/win32/mshtml              # Synced to Wine-1.7.1
+reactos/dll/win32/mshtml.tlb          # Synced to Wine-1.7.1
+reactos/dll/win32/msi                 # Synced to Wine-1.7.1
+reactos/dll/win32/msimg32             # Synced to Wine-1.7.1
+reactos/dll/win32/msimtf              # Synced to Wine-1.7.1
+reactos/dll/win32/msisip              # Synced to Wine-1.7.1
+reactos/dll/win32/msisys.ocx          # Synced to Wine-1.7.1
+reactos/dll/win32/msnet32             # Synced to Wine-1.7.1
+reactos/dll/win32/msrle32             # Synced to Wine-1.7.1
+reactos/dll/win32/mssign32            # Synced to Wine-1.7.1
+reactos/dll/win32/mssip32             # Synced to Wine-1.7.1
+reactos/dll/win32/mstask              # Synced to Wine-1.7.1
+reactos/dll/win32/msvcrt20            # Out of sync
+reactos/dll/win32/msvcrt40            # Out of sync
+reactos/dll/win32/msvfw32             # Synced to Wine-1.7.1
+reactos/dll/win32/msvidc32            # Synced to Wine-1.7.1
+reactos/dll/win32/msxml               # Synced to Wine-1.7.1
+reactos/dll/win32/msxml2              # Synced to Wine-1.7.1
+reactos/dll/win32/msxml3              # Synced to Wine-1.7.1
+reactos/dll/win32/msxml4              # Synced to Wine-1.7.1
+reactos/dll/win32/msxml6              # Synced to Wine-1.7.1
+reactos/dll/win32/nddeapi             # Synced to Wine-1.7.1
+reactos/dll/win32/netapi32            # Forked at Wine-1.3.34
+reactos/dll/win32/ntdsapi             # Synced to Wine-1.7.1
+reactos/dll/win32/ntprint             # Synced to Wine-1.7.1
+reactos/dll/win32/objsel              # Synced to Wine-1.7.1
+reactos/dll/win32/odbc32              # Synced to Wine-1.7.1. Depends on port of Linux ODBC.
+reactos/dll/win32/odbccp32            # Synced to Wine-1.7.1
+reactos/dll/win32/ole32               # Synced to Wine-1.7.1
+reactos/dll/win32/oleacc              # Synced to Wine-1.7.1
+reactos/dll/win32/oleaut32            # Synced to Wine-1.7.1
+reactos/dll/win32/olecli32            # Synced to Wine-1.7.1
+reactos/dll/win32/oledlg              # Synced to Wine-1.7.1
+reactos/dll/win32/olepro32            # Synced to Wine-1.7.1
+reactos/dll/win32/olesvr32            # Synced to Wine-1.7.1
+reactos/dll/win32/olethk32            # Synced to Wine-1.7.1
+reactos/dll/win32/pdh                 # Synced to Wine-1.7.1
+reactos/dll/win32/pidgen              # Synced to Wine-1.7.1
+reactos/dll/win32/powrprof            # Forked at Wine-1.0rc5
+reactos/dll/win32/printui             # Synced to Wine-1.7.1
+reactos/dll/win32/propsys             # Synced to Wine-1.7.1
+reactos/dll/win32/pstorec             # Synced to Wine-1.7.1
+reactos/dll/win32/qmgr                # Synced to Wine-1.7.1
+reactos/dll/win32/qmgrprxy            # Synced to Wine-1.7.1
+reactos/dll/win32/query               # Synced to Wine-1.7.1
+reactos/dll/win32/rasapi32            # Synced to Wine-1.7.1
+reactos/dll/win32/resutils            # Synced to Wine-1.7.1
+reactos/dll/win32/riched20            # Synced to Wine-1.7.1
+reactos/dll/win32/riched32            # Synced to Wine-1.7.1
+reactos/dll/win32/rpcrt4              # Synced to Wine-1.7.1
+reactos/dll/win32/rsabase             # Synced to Wine-1.7.1
+reactos/dll/win32/rsaenh              # Synced to Wine-1.7.17
+reactos/dll/win32/sccbase             # Synced to Wine-1.7.1
+reactos/dll/win32/schannel            # Synced to Wine-1.7.1
+reactos/dll/win32/scrrun              # Synced to Wine-1.7.1
+reactos/dll/win32/secur32             # Forked
+reactos/dll/win32/security            # Forked (different .spec)
+reactos/dll/win32/sensapi             # Synced to Wine-1.7.1
+reactos/dll/win32/setupapi            # Forked at Wine-20050524
+reactos/dll/win32/shdoclc             # Synced to Wine-1.7.1
+reactos/dll/win32/shdocvw             # Synced to Wine-1.7.1
+reactos/dll/win32/shell32             # Forked at Wine-20071011
+reactos/dll/win32/shfolder            # Synced to Wine-1.7.1
+reactos/dll/win32/shlwapi             # Synced to Wine-1.7.1
+reactos/dll/win32/slbcsp              # Synced to Wine-1.7.1
+reactos/dll/win32/snmpapi             # Synced to Wine-1.7.1
+reactos/dll/win32/softpub             # Synced to Wine-1.7.1
+reactos/dll/win32/spoolss             # Synced to Wine-1.7.1
+reactos/dll/win32/stdole2.tlb         # Synced to Wine-1.7.1
+reactos/dll/win32/stdole32.tlb        # Synced to Wine-1.7.1
+reactos/dll/win32/sti                 # Synced to Wine-1.7.1
+reactos/dll/win32/sxs                 # Synced to Wine-1.7.1
+reactos/dll/win32/tapi32              # Synced to Wine-1.7.1
+reactos/dll/win32/traffic             # Synced to Wine-1.7.1
+reactos/dll/win32/twain_32            # Synced to Wine-1.7.1
+reactos/dll/win32/unicows             # Synced to Wine-1.3.32 (Win9x only, why do we need this?!)
+reactos/dll/win32/updspapi            # Synced to Wine-1.7.1
+reactos/dll/win32/url                 # Synced to Wine-1.7.1
+reactos/dll/win32/urlmon              # Synced to Wine-1.7.1
+reactos/dll/win32/usp10               # Synced to Wine-1.7.14
+reactos/dll/win32/uxtheme             # Forked
+reactos/dll/win32/vbscript            # Synced to Wine-1.7.1
+reactos/dll/win32/version             # Synced to Wine-1.7.1
+reactos/dll/win32/wbemdisp            # Synced to Wine-1.7.1
+reactos/dll/win32/wbemprox            # Synced to Wine-1.7.2
+reactos/dll/win32/wer                 # Autosync
+reactos/dll/win32/windowscodecs       # Synced to Wine-1.7.1
+reactos/dll/win32/windowscodecsext    # Synced to Wine-1.7.1
+reactos/dll/win32/winemp3.acm         # Synced to Wine-1.7.1
+reactos/dll/win32/wing32              # Out of sync
+reactos/dll/win32/winhttp             # Synced to Wine-1.7.1
+reactos/dll/win32/wininet             # Synced to Wine-1.7.1
+reactos/dll/win32/winmm               # Forked at Wine-20050628
+reactos/dll/win32/winmm/midimap       # Forked at Wine-20050628
+reactos/dll/win32/winmm/wavemap       # Forked at Wine-20050628
+reactos/dll/win32/wintrust            # Synced to Wine-1.7.1
+reactos/dll/win32/wldap32             # Synced to Wine-1.7.1
+reactos/dll/win32/wmi                 # Synced to Wine-1.7.1
+reactos/dll/win32/wtsapi32            # Synced to Wine-1.7.1
+reactos/dll/win32/wuapi               # Synced to Wine-1.7.1
+reactos/dll/win32/xinput1_1           # Synced to Wine-1.7.1
+reactos/dll/win32/xinput1_2           # Synced to Wine-1.7.1
+reactos/dll/win32/xinput1_3           # Synced to Wine-1.7.1
+reactos/dll/win32/xinput9_1_0         # Synced to Wine-1.7.1
+reactos/dll/win32/xmllite             # Synced to Wine-1.7.17
 
-reactos/dll/cpl/inetcpl            # Synced to Wine-1.7.1
+reactos/dll/cpl/inetcpl               # Synced to Wine-1.7.1
 
 ReactOS shares the following programs with Winehq.
 
@@ -246,7 +247,7 @@ In addition the following libs, dlls and source files are mostly based on code p
 from Winehq CVS. If you are looking to update something in these files
 check Wine current souces first as it may already be fixed.
 
-reactos/lib/3rdparty/strmbase             # Synced to Wine-1.7.17
+reactos/lib/3rdparty/strmbase               # Synced to Wine-1.7.17
 
 advapi32 -
   reactos/dll/win32/advapi32/crypt/*.c          # Synced to Wine-1.7.1