Index: media/doc/README.WINE =================================================================== --- media/doc/README.WINE (Revision 60827) +++ media/doc/README.WINE (Arbeitskopie) @@ -8,22 +8,17 @@ please add it. If you find that a function in ReactOS that is not implemented properly -and is based on WINE sources, check the latest Winehq CVS and see if -it has been fixed there. If so, please submit a patch to -ros-dev@reactos.org. Otherwise please send a patch to both -wine-patches@winehq.com and ros-dev@reactos.org +and is based on WINE sources, check the latest Winehq git +at http://source.winehq.org/git/wine.git/ and see if it has been fixed there. +If so, please submit a patch to ros-dev@reactos.org. +Otherwise please send a patch to both wine-patches@winehq.org +and ros-dev@reactos.org. -When porting a new DLL from Wine to ReactOS, please do the following steps -- Create a new directory in dll/win32/ of the same name as the new Wine DLL -- Add a new entry in dll/win32/win32.rbuild -- Follow the guide "Update process for autosync DLLs" at the bottom of this file - - The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-1.7.1 -reactos/tools/widl # Synced to Wine-1.5.11 -reactos/tools/wpp # Synced to Wine-1.7.1 +reactos/tools/unicode # Synced to Wine-1.7.1 +reactos/tools/widl # Synced to Wine-1.5.11 +reactos/tools/wpp # Synced to Wine-1.7.1 The following libraries are shared with Wine. @@ -145,7 +140,7 @@ reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to Wine-1.5.19 reactos/dll/win32/ole32 # Synced to Wine-1.7.1 -reactos/dll/win32/oleacc # Autosync +reactos/dll/win32/oleacc # Synced to Wine-1.1.40 reactos/dll/win32/oleaut32 # Synced to Wine-1.7.1 reactos/dll/win32/olecli32 # Synced to Wine-1.5.19 reactos/dll/win32/oledlg # Synced to Wine-1.7.1 @@ -166,7 +161,7 @@ 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.3.26 -reactos/dll/win32/rsabase # Autosync +reactos/dll/win32/rsabase # Out of sync. See rsaenh instead. reactos/dll/win32/rsaenh # Synced to Wine-1.7.1 reactos/dll/win32/sccbase # Synced to Wine-1.7.1 reactos/dll/win32/schannel # Synced to Wine-1.5.19 @@ -198,9 +193,9 @@ reactos/dll/win32/usp10 # Synced to Wine-1.7.1 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to Wine-1.7.1 -reactos/dll/win32/version # Autosync +reactos/dll/win32/version # Synced to Wine-1.1.41 reactos/dll/win32/wbemprox # Synced to Wine-1.7.2 -reactos/dll/win32/wer # Autosync +reactos/dll/win32/wer # Synced to Wine-1.3.7 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 @@ -229,8 +224,8 @@ reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.5.25 reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.1 reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.3.37 -reactos/base/applications/games/winmine # Forked at Wine-1_3_5 -reactos/base/applications/extrac32 # Autosync +reactos/base/applications/games/winmine # Forked at Wine-1.3.5 +reactos/base/applications/extrac32 # Synced to Wine-1.1.40 reactos/base/applications/iexplore # Synced to Wine-1.5.26 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync @@ -239,22 +234,23 @@ reactos/base/services/rpcss # Synced to Wine-1.7.1 reactos/base/system/expand # Synced to Wine-1.5.26 reactos/base/system/msiexec # Synced to Wine-1.5.26 -reactos/modules/rosapps/winfile # Autosync +reactos/modules/rosapps/winfile # Synced to Wine-1.3.10 In addition the following libs, dlls and source files are mostly based on code ported 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.1 -reactos/lib/sdk/uuid # Synced to Wine-1.1.42 +reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.1 +reactos/lib/sdk/uuid # Synced to Wine-1.1.42 -advapi32 - - reactos/dll/win32/advapi32/crypt/*.c # Unknown - reactos/dll/win32/advapi32/sec/cred.c # Out of Sync - reactos/dll/win32/advapi32/sec/sid.c # Out of Sync +advapi32 - # Forked, some functions are synced + reactos/dll/win32/advapi32/crypt/*.c + reactos/dll/win32/advapi32/sec/cred.c + reactos/dll/win32/advapi32/sec/sid.c gdi32 - - reactos/dll/win32/gdi32/objects/linedda.c # Synced at 20090410 + reactos/win32ss/gdi/gdi32/objects/linedda.c # Synced at 20090410 + reactos/win32ss/gdi/gdi32/objects/font.c # Partly synced (r54103) kernel32 - reactos/dll/win32/kernel32/wine/actctx.c # Partly synced @@ -272,70 +268,60 @@ reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced in r52754 msvcrt - - reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528 - reactos/lib/sdk/crt/except/cppexcept.c # Synced at 20071111 - reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1_1_27 - reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 - reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 - reactos/lib/sdk/crt/wine/undname.c # Synced at 20081130 - reactos/lib/sdk/crt/thread/thread.c # Synced at 20080604 + reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528 + reactos/lib/sdk/crt/locale/locale.c # Synced to Wine-1.5.26 + reactos/lib/sdk/crt/except/cppexcept.c # Synced to Wine-1.1.14 + reactos/lib/sdk/crt/include/internal/wine/cppexcept.h # Synced to Wine-1.1.14 + reactos/lib/sdk/crt/include/internal/wine/eh.h # Unknown + reactos/lib/sdk/crt/include/internal/wine/msvcrt.h # Partly synced to Wine-1.5.26 + reactos/lib/sdk/crt/mbstring/hanzen.c # Synced to Wine-1.5.19 + reactos/lib/sdk/crt/include/internal/locale.h # Synced to Wine-1.5.19 + reactos/lib/sdk/crt/include/internal/mbstring.h # Synced to Wine-1.5.19 + reactos/lib/sdk/crt/include/internal/tls.h # Synced to Wine-1.5.19 + reactos/lib/sdk/crt/mbstring/_setmbcp.c # Synced to Wine-1.5.19 + reactos/lib/sdk/crt/mbstring/mbsncpy.c # Synced to Wine-1.5.19 + reactos/lib/sdk/crt/misc/tls.c # Synced to Wine-1.5.19 + reactos/lib/sdk/crt/precomp.h # Synced to Wine-1.5.19 + reactos/lib/sdk/crt/stdio/file.c # Forked! Partly synced to Wine-1.3.34 + reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1.1.27 + reactos/lib/sdk/crt/string/ctype.c # Synced to Wine-1.5.19 + reactos/lib/sdk/crt/string/wcs.c # Synced to Wine-1.5.19 + reactos/lib/sdk/crt/string/_wcslwr_s.c # Synced to Wine-1.5.30 + reactos/lib/sdk/crt/time/strftime.c # Synced to Wine-1.5.19 + reactos/lib/sdk/crt/thread/thread.c # Synced at 20080604 + reactos/lib/sdk/crt/wine/heap.c # Synced to Wine-1.3.32 + reactos/lib/sdk/crt/wine/undname.c # Synced to Wine-1.3.32 User32 - - reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_39 - reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1.5.10 - reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_40 - reactos/dll/win32/user32/controls/icontitle.c # Synced to Wine-1_1_39 - reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_39 - reactos/dll/win32/user32/controls/scrollbar.c # Forked - reactos/dll/win32/user32/controls/static.c # Synced to Wine-1_1_39 + reactos/win32ss/user/user32/controls/button.c # Synced to Wine-1.3.34 + reactos/win32ss/user/user32/controls/combo.c # Synced to Wine-1.5.31 + reactos/win32ss/user/user32/controls/edit.c # Synced to Wine-1.5.31 + reactos/win32ss/user/user32/controls/icontitle.c # Synced to Wine-1.1.39 + reactos/win32ss/user/user32/controls/listbox.c # Synced to Wine-1.5.31 + reactos/win32ss/user/user32/controls/scrollbar.c # Partly synced to Wine-1.5.31 (see also r57091) + reactos/win32ss/user/user32/controls/static.c # Synced to Wine-1.3.34 - reactos/dll/win32/user32/include/dde_private.h # Synced to wine 1.1.24 + reactos/win32ss/user/user32/include/dde_private.h # Synced to Wine-1.1.24 - reactos/dll/win32/user32/misc/dde.c # Synced to wine 1.1.24 (dde_misc.c) - reactos/dll/win32/user32/misc/ddeclient.c # Synced to Wine-1_1_23 - reactos/dll/win32/user32/misc/ddeserver.c # Synced to Wine-1_1_23 - reactos/dll/win32/user32/misc/exticon.c # Synced to Wine-1_1_22 - reactos/dll/win32/user32/misc/resources.c # Forked? - reactos/dll/win32/user32/misc/winhelp.c # Last sync date unknown - reactos/dll/win32/user32/misc/wsprintf.c # Synced to Wine-1_1_23 + reactos/win32ss/user/user32/misc/dde.c # Synced to Wine-1.1.34 (dde_misc.c) + reactos/win32ss/user/user32/misc/ddeclient.c # Synced to Wine-1.1.23 + reactos/win32ss/user/user32/misc/ddeserver.c # Synced to Wine-1.1.23 + reactos/win32ss/user/user32/misc/exticon.c # Synced to Wine-1.1.22 + reactos/win32ss/user/user32/misc/resources.c # Partly synced at 2009-01-08 + reactos/win32ss/user/user32/misc/winhelp.c # Synced at 2002-08-23 + reactos/win32ss/user/user32/misc/wsprintf.c # Synced to Wine-1.1.23 - reactos/dll/win32/user32/windows/cursoricon # Forked from wine 1.2-rc7 - reactos/dll/win32/user32/windows/defwnd.c # Forked - reactos/dll/win32/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c) - reactos/dll/win32/user32/windows/mdi.c # Synced to Wine-1_1_40 - reactos/dll/win32/user32/windows/menu.c # Forked - reactos/dll/win32/user32/windows/messagebox.c # Forked - reactos/dll/win32/user32/windows/rect.c # Forked (uitools.c) - reactos/dll/win32/user32/windows/spy.c # Synced to Wine-1_1_40 - reactos/dll/win32/user32/windows/text.c # Forked (lstr.c) - reactos/dll/win32/user32/windows/winpos.c # Forked + reactos/win32ss/user/user32/windows/cursoricon.c # Forked from Wine-1.2-rc7 + reactos/win32ss/user/user32/windows/defwnd.c # Forked + reactos/win32ss/user/user32/windows/draw.c # Forked at 2002-09-04 (uitools.c) + reactos/win32ss/user/user32/windows/mdi.c # Synced to Wine-1.1.40 + reactos/win32ss/user/user32/windows/menu.c # Forked + reactos/win32ss/user/user32/windows/messagebox.c # Forked + reactos/win32ss/user/user32/windows/rect.c # Forked (uitools.c) + reactos/win32ss/user/user32/windows/spy.c # Synced to Wine-1.5.26 + reactos/win32ss/user/user32/windows/text.c # Forked (lstr.c) + reactos/win32ss/user/user32/windows/winpos.c # Forked ws2_32 - - reactos/dll/win32/ws2_32/misc/async.c # Synced to Wine-1.5.4 - -Update process for autosync DLLs - -*** This process can only be done on Microsoft Windows *** -- Download wineimport.cmd at svn://svn.reactos.org/project-tools/trunk/ -- Download cvs command line program and be sure to put it in your path - (available at http://ftp.gnu.org/non-gnu/cvs/binary/stable/x86-woe/ ) -- Download svn command line program and be sure to put it in your path - (available at http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 ) -- Download patch command line program and be sure to put it in your path - (available at http://gnuwin32.sourceforge.net/packages/patch.htm ) -- Optionally, download junction.exe and put it in your path - (available at http://www.sysinternals.com/Utilities/Junction.html ) -- Cd to the directory containing wineimport.cmd -- Run - "wineimport.cmd fullprocessing {path_to_your_reactos_directory} {name_of_the_wine_dll}" -- In case of error, you can - 1) add missing definitions to ReactOS headers - 2) fix {name_of_the_wine_dll}_ros.diff patch file, by removing outdated changes - 3) or modify Wine code, by adding a {name_of_the_wine_dll}_ros.diff patch, - which will be applied after Wine source checkout - DO NOT DIRECTLY MODIFY WINE SOURCE CODE -- Once Wine DLL compiles, install and run ReactOS and search for regressions -- In case of regression, you can - 1) Fix ReactOS code (not in the shared DLL) - 2) or update the {name_of_the_wine_dll}_ros.diff patch file -- Commit your changes with the "Autosyncing with Wine HEAD" commit message + reactos/dll/win32/ws2_32/misc/async.c # Synced to Wine-1.5.4 + \ No newline at end of file