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.com. Otherwise please send a patch to both
-wine-patches@winehq.com and ros-dev@reactos.com
+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
-When porting a dll from WINE to ReactOS please take a look at how
-comctl32 has been imported. We start by creating a makefile that has
-a target defined like so:
+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
-TARGET_TYPE = winedll
-
-This will cause the reactos build system to look for a file called
-makefile.ros-template. This file contains all of the information needed
-for the ReactOS build system to make use of the WINE Makefile.in.
-This will allow you to use the WINE tools and librarys with very little
-work to import a new dll.
The following build tools are shared with Wine.
reactos/tools/unicode # Synced to Wine-0_9_5
reactos/tools/wpp # Synced to Wine-0_9_5
-reactos/tools/bin2res # Resource to binary converter
-reactos/tools/winebuild # Synced to Wine-0_9_5
-reactos/tools/wmc # Synced to Wine-0_9_5
-reactos/tools/wrc # Synced to Wine-0_9_5
-reactos/tools/widl # Forked at Wine-20050930
+reactos/tools/winebuild # Synced to Wine-20071217
+reactos/tools/wmc # Synced to Wine-20071201
+reactos/tools/wrc # Synced to Wine-0_9_53
+reactos/tools/widl # Synced to Wine-0_9_55
The following libraries are shared with Wine.
-reactos/dll/win32/avifil32 # Synced to Wine-0_9_5
+reactos/dll/win32/advpack # Autosync
+reactos/dll/win32/atl # Autosync
+reactos/dll/win32/avifil32 # Autosync
+reactos/dll/win32/browseui # Out of sync
reactos/dll/win32/cabinet # Autosync
-reactos/dll/win32/comctl32 # Synced to Wine-0_9_16
-reactos/dll/win32/comdlg32 # Synced to Wine-0_9_16
-reactos/dll/win32/crypt32 # Autosync
+reactos/dll/win32/clusapi # Autosync
+reactos/dll/win32/comcat # Autosync
+reactos/dll/win32/comctl32 # Autosync
+reactos/dll/win32/comdlg32 # Autosync
+reactos/dll/win32/compstui # Autosync
+reactos/dll/win32/crypt32 # Synced to Wine-1_0-rc1
reactos/dll/win32/cryptdll # Autosync
-reactos/dll/win32/dbghelp #
-reactos/dll/win32/icmp # Synced to Wine-0_9_10
+reactos/dll/win32/cryptnet # Autosync
+reactos/dll/win32/dbghelp # Synced to Wine-20080106
+reactos/dll/win32/dciman32 # Synced to Wine-1_0-rc2
+reactos/dll/win32/gdiplus # Autosync
+reactos/dll/win32/hhctrl.ocx # Autosync
+reactos/dll/win32/hlink # Autosync
+reactos/dll/win32/icmp # Synced to Wine-0_9_10
reactos/dll/win32/imm32 # Autosync
-reactos/dll/win32/iphlpapi # Out of sync
reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq.
-reactos/dll/win32/mapi32 # Synced to Wine-0_9_10
-reactos/dll/win32/msvcrt20 # Out of sync
-reactos/dll/win32/mpr # Synced to Wine-0_9_5
-reactos/dll/win32/msacm # Out of sync
-reactos/dll/win32/msimg32 # Synced to Wine-0_9_12
-reactos/dll/win32/msi # Synced to Wine-0_9_5
-reactos/dll/win32/msvideo # Out of sync
-reactos/dll/win32/netapi32 # Synced to Wine-0_9_5
-reactos/dll/win32/objsel # Synced to Wine-0_9_12
+reactos/dll/win32/inetcomm # Autosync
+reactos/dll/win32/iphlpapi # Out of sync
+reactos/dll/win32/lz32 # Autosync
+reactos/dll/win32/mapi32 # Autosync
+reactos/dll/win32/mlang # Autosync
+reactos/dll/win32/mpr # Autosync
+reactos/dll/win32/msacm32 # Out of sync
+reactos/dll/win32/mshtml # Autosync
+reactos/dll/win32/msimg32 # Autosync
+reactos/dll/win32/msi # Autosync
+reactos/dll/win32/msvcrt20 # Autosync
+reactos/dll/win32/msvfw32 # Autosync
+reactos/dll/win32/msxml3 # Synced to Wine-20071230
+reactos/dll/win32/nddeapi # Autosync
+reactos/dll/win32/netapi32 # Autosync
+reactos/dll/win32/ntdsapi # Autosync
+reactos/dll/win32/objsel # Autosync
reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC.
-reactos/dll/win32/ole32 # Synced to Wine-0_9_5
-reactos/dll/win32/oleacc # Synced to Wine-0_9_10
-reactos/dll/win32/oleaut32 # Synced to Wine-0_9_10
-reactos/dll/win32/oledlg # Synced to Wine-0_9_5
-reactos/dll/win32/olepro32 # Synced to Wine-0_9_10
-reactos/dll/win32/powrprof # Synced to Wine-0_9_14
-reactos/dll/win32/riched20 # Synced to Wine-0_9_5
-reactos/dll/win32/richedit # Synced to Wine-0_9_10
-reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_10
+reactos/dll/win32/odbccp32 # Autosync
+reactos/dll/win32/ole32 # Autosync
+reactos/dll/win32/oleacc # Autosync
+reactos/dll/win32/oleaut32 # Autosync
+reactos/dll/win32/oledlg # Autosync
+reactos/dll/win32/olepro32 # Autosync
+reactos/dll/win32/pdh # Autosync
+reactos/dll/win32/powrprof # Autosync
+reactos/dll/win32/printui # Autosync
+reactos/dll/win32/rasapi32 # Autosync
+reactos/dll/win32/riched20 # Autosync
+reactos/dll/win32/riched32 # Autosync
+reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_55
+reactos/dll/win32/rsabase # Autosync
+reactos/dll/win32/rsaenh # Autosync
+reactos/dll/win32/schannel # Autosync
+reactos/dll/win32/sensapi # Autosync
reactos/dll/win32/setupapi # Forked at Wine-20050524
-reactos/dll/win32/shell32 # Synced to Wine-0_9_5
+reactos/dll/win32/shell32 # Forked at Wine-20071011
reactos/dll/win32/shdocvw # Synced to Wine-0_9_5
-reactos/dll/win32/shfolder # Synced to Wine-0_9_5
-reactos/dll/win32/shlwapi # Synced to Wine-0_9_5
-reactos/dll/win32/twain # Out of sync
-reactos/dll/win32/urlmon # Synced to Wine-0_9_10
-reactos/dll/win32/uxtheme # Synced to Wine-0_9_10
-reactos/dll/win32/version # Synced at 20060509
-reactos/dll/win32/wininet # Synced to Wine-0_9_10
-reactos/dll/win32/wintrust # Synced to Wine-0_9_10
+reactos/dll/win32/shfolder # Autosync
+reactos/dll/win32/shlwapi # Autosync
+reactos/dll/win32/stdole2.tlb # Autosync
+reactos/dll/win32/tapi32 # Autosync
+reactos/dll/win32/twain_32 # Out of sync
+reactos/dll/win32/urlmon # Autosync
+reactos/dll/win32/usp10 # Autosync
+reactos/dll/win32/uxtheme # Autosync
+reactos/dll/win32/version # Autosync
+reactos/dll/win32/wininet # Autosync
+reactos/dll/win32/winhttp # Autosync
+reactos/dll/win32/wintrust # Out of sync
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/wldap32 # Autosync
+reactos/dll/win32/wtsapi32 # Autosync
reactos/dll/directx/dinput # Synced to Wine-0_9_5
reactos/dll/directx/dinput8 # Synced to Wine-0_9_5
reactos/dll/directx/dplay # Synced to Wine-0_9_5
reactos/base/applications/games/winemine # Out of sync
reactos/base/applications/regedit # Out of sync
+reactos/base/applications/cmdutils/xcopy # Synced to Wine-0_9_54
reactos/base/system/expand # Out of sync
-reactos/base/system/msiexec # Synced to Wine-0_9_3
+reactos/base/system/msiexec # Wine 1.0-rc1
+reactos/base/applications/winhelp # Synced to Wine-0_9_53
+reactos/base/applications/wordpad # Synced to Wine-0_9_53
+reactos/modules/rosapps/winefile # Synced to Wine-0_9_53
+reactos/base/applications/notepad # Forked at Wine-20041201
+reactos/base/applications/iexplore # Wine 1.0-rc1
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/uuid #
+reactos/lib/uuid # Synced to Wine-20080114
advapi32 -
reactos/dll/win32/advapi32/crypt/*.c # ekohl says we're not sharing this
msvcrt -
reactos/dll/win32/msvcrt/wine/*.c # Out of sync
+ reactos/lib/sdk/crt/cpp.c # Synced at 20071111
+ reactos/lib/sdk/crt/cppexcept.c # Synced at 20071111
+ reactos/lib/sdk/crt/wine # Synced at XXXXXXXX
User32 -
- reactos/dll/win32/user32/controls/button.c # Synced at 20060621
- reactos/dll/win32/user32/controls/combo.c # Synced at 20060617
- reactos/dll/win32/user32/controls/edit.c # Synced at 20060623
+ reactos/dll/win32/user32/controls/button.c # Synced at 20071022
+ reactos/dll/win32/user32/controls/combo.c # Synced at 20071022
+ reactos/dll/win32/user32/controls/edit.c # Synced at 20071022
reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617
- reactos/dll/win32/user32/controls/listbox.c # Synced at 20060616
+ reactos/dll/win32/user32/controls/listbox.c # Synced at 20071023
reactos/dll/win32/user32/controls/scrollbar.c # Forked
- reactos/dll/win32/user32/controls/static.c # Synced at 20060622
+ reactos/dll/win32/user32/controls/static.c # Synced at 20071024
- reactos/dll/win32/user32/misc/dde.c # Synced at 20060623 (dde_misc.c)
+ reactos/dll/win32/user32/misc/dde.c # Synced at 20080414 (dde_misc.c)
reactos/dll/win32/user32/misc/ddeclient.c # Synced at 20060623
reactos/dll/win32/user32/misc/ddeserver.c # Synced at 20060623
reactos/dll/win32/user32/misc/exticon.c # Last sync date unknown
reactos/dll/win32/user32/windows/text.c # Forked (lstr.c)
reactos/dll/win32/user32/windows/winpos.c # Forked
-Update process for shared DLLs
-
-- Cd to the parent directory of your top-level "reactos" directory
-- Check out the Wine release: "cvs -d :pserver:cvs@cvs.winehq.com:2401/home/wine co wine -r Wine-20050211"
-- Create "vendor" directory (as a sibling of your top-level "reactos" directory)
-- Cd to the vendor dir and check out the current vendor drop:
- "svn co svn://svn.reactos.org/reactos/vendor/wine".
-- For each component shared with Wine (e.g. cabinet):
- "del vendor\wine\dlls\cabinet\current\*"
- "copy wine\dlls\cabinet vendor\wine\dlls\cabinet\current"
- "del vendor\wine\dlls\cabinet\current\.cvsignore"
- Check svn status, svn add/delete files as needed
- Tag new Wine release "svn copy vendor\wine\dlls\cabinet\current vendor\wine\dlls\cabinet\Wine-20050211"
-- Commit the vendor drop: svn commit vendor\wine -m "Wine-20050211 vendor drop"
-- Determine the revision number of the last Wine tag by looking at http://svn.reactos.ru/svn/reactos/tags/
- and finding the last Wine-yyyymmdd-sync tag, e.g. Wine-20050111-sync had rev 13007
-- For each component shared with Wine (e.g. cabinet):
-- "cd reactos\lib\cabinet"
-- Check for changes in the ReactOS tree: "svn diff -r 13007" (13007 is the revno of the previous sync).
- If any changes are found, see if they're present in the Wine code. If not, submit to WineHQ
- if apropriate.
-- Merge in Wine changes:
- "svn merge svn://svn.reactos.org/vendor/wine/dlls/cabinet/Wine-20050111
- svn://svn.reactos.org/vendor/wine/dlls/cabinet/current"
-- Fix any merge conflicts
-- Build and test (building will sometimes require adjusting header files)
-- Check which files were changed: "svn status"
-- For each of the changed files, get the WineHQ CVS log. Copy author and CVS commit message into a
- commit log
-- Commit changed files "svn commit" using generated commit log as commit message
+Update process for autosync DLLs
+
+*** This process can only be done on Microsoft Windows ***
+- Download wineimport.cmd at svn://svn.reactos.org/reactos/trunk/tools/
+- 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
projects / reactos.git / blobdiff