Commit graph

21 commits

Author SHA1 Message Date
Cameron Gutman c2d0d784c7 [USB-BRINGUP-TRUNK]
- Create a branch to do a proper merge of USB work from a trunk base instead of from cmake-bringup
- In the future, DO NOT under any circumstances branch another branch. This leads to merge problems!

svn path=/branches/usb-bringup-trunk/; revision=55018
2012-01-20 20:58:46 +00:00
Timo Kreuzer 447be42c33 Merge 46523 from amd64 branch:
- Fix assert macro
- Add crt="MSVC" to a number of modules to resolve _assert

svn path=/trunk/; revision=47533
2010-06-03 12:47:40 +00:00
Aleksey Bragin 260b4a396b [COMDLG32]
- Sync to Wine-1.1.40.

svn path=/trunk/; revision=46102
2010-03-11 17:37:30 +00:00
Colin Finck dfa9eb6204 [General]
- Remove the "kernel32" library reference in all .rbuild files of user-mode modules, because this one is already added by "mingw_common". Also fix the indentation in some files.

svn path=/trunk/; revision=44368
2009-12-02 20:32:16 +00:00
Stefan Ginsberg 50e193b557 - Follow up to 41644: Get rid of the Wine headers using include_next as the definitions are now in the PSDK, wrapped under _WINE. Also define _WINE for the modules using those types.
- Move MCI_OPEN_DRIVER and MCI_CLOSE_DRIVER to mmddk.h as this is where they belong. Also move them out of the _WINE guard as those defines are present in the official headers.
- Add GetDriverFlags to mmsystem.h (missed this one in 41644).
- Most Wine code now compiles fine in MSVC.
- Wrap include_next in crt/float.h under a __GNUC__ guard -- not quite correct as the included float.h defines some stuff that should be in the "real" float.h.
- winnt.h: Remove duplicated LANG* defines that are already defined there and present in the official headers. Remove the _WINE guard from the rest as we may want to provide translations for those languages too.

svn path=/trunk/; revision=42386
2009-08-04 18:34:06 +00:00
Stefan Ginsberg 0978aae3eb - Revert most of 38953. This was a bad idea, sorry.
svn path=/trunk/; revision=38998
2009-01-21 14:41:23 +00:00
Stefan Ginsberg 9e89c8c187 - Kill off more unnecessary allowwarnings="true"
- Remove a .rbuild diff from oleaut32_ros.diff -- Wine doesn't use .rbuild, so why put this in .diff?

svn path=/trunk/; revision=38953
2009-01-19 19:44:55 +00:00
KJK::Hyperion 8b822b8a26 Hopefully, the definitive spec files commit. Dedicated to Samuel Serapión, who reported issues with my previous commits.
modified   tools/rbuild/backend/mingw/modulehandler.cpp
   Specifying .spec/.pspec files twice (<importlibrary> and <file>) didn't really make sense (stubs are unusable without the .def and viceversa), so they can now be only specified in <importlibrary>. I'd rather drop <importlibrary> completely and specify .def/.spec/.pspec as <file>s, but it's too hard so it'll have to wait. At least we got rid of one invocation of the preprocessor for .pspec files
   Simplified and improved rules to generate spec and stub files from .pspec
   Did you know we set the wrong DLL name in autogenerated .def files? Always pass the right name to winebuild with --filename, just to be sure
   Fully support compiling .pspec/.spec files from the intermediate directory
   Import libraries don't actually depend on stub/thunk files

modified   tools/rbuild/backend/mingw/modulehandler.h
   Removed some dead code

modified   tools/rbuild/backend/mingw/rule.cpp
modified   tools/rbuild/module.cpp
modified   tools/rbuild/rbuild.h
   Allow <importlibrary dllname="..." ...> in all module types. Why? Why not?

modified   Makefile
   Added ECHO_CPP to echo invocations of the C preprocessor

Everything else: removed all <file> entries for .spec/.pspec files. It was just maintenance overhead

svn path=/trunk/; revision=37270
2008-11-10 02:31:24 +00:00
Aleksey Bragin 64bd93d803 - Globalize ReactOS target version (there are a few overrides for our abuse of RegDeleteTree API).
*** .rbuild files MUST NOT contain version definitions now, please pay attention to this when doing Wine-syncs, adding new modules, or applying old patches! ***
Same applies to source code files, header files, and other includables. Thanks to Marc Piulachs for doing the base work, which I continued, and which resulted in this commit.
See issue #2745 for more details.

svn path=/trunk/; revision=36939
2008-10-25 12:15:44 +00:00
KJK::Hyperion 9ac0fa4e4d modified tools/rbuild/backend/mingw/modulehandler.cpp
modified   tools/rbuild/backend/mingw/modulehandler.h
modified   tools/rbuild/module.cpp
   Split rules for .spec files as input files vs import libraries. .spec files can now be specified independently as <file>s (to generate and compile a .stubs.c file) and <importlibrary> (to generate and compile a .spec.def file)
   .spec files are now specified in <importlibrary>s directly (instead of pointing to the non-existing, generated .spec.def file. Whose idea was that? sounds like the doing of Arch Blackmann)
   Allow multiple modules to share a single .spec file without using <importlibrary base="...">
   Allow static libraries to use .spec files in <importlibrary>
   Emit comments in makefile.auto so rules can be traced back to the code that generated them

deleted    lib/debugsup/debugsup-ntos.def
added      lib/debugsup/debugsup-ntos.spec
modified   lib/debugsup/debugsup.rbuild
   .def -> .spec

<<hundreds of rbuild files>>
   Remove <file> entry for spec file if there are no stubs to compile
   .spec.def -> .spec in <importlibrary> entries

Soon: making all keyboard layouts use a single .spec file
Dedicated to: Samuel Serapión, Stefan Ginsberg, and all the fellow team members who'll have an aneurysm at this commit

See issue #3746 for more details.

svn path=/trunk/; revision=36870
2008-10-21 13:51:49 +00:00
Aleksey Bragin b1863a26c7 Autosyncing with Wine HEAD
svn path=/trunk/; revision=34337
2008-07-06 16:35:30 +00:00
The Wine Synchronizer a92ed506c9 Autosyncing with Wine HEAD
svn path=/trunk/; revision=32839
2008-04-04 12:16:03 +00:00
The Wine Synchronizer 9801c4a81f Autosyncing with Wine HEAD
svn path=/trunk/; revision=31774
2008-01-14 12:43:19 +00:00
The Wine Synchronizer c1eaa7b625 Autosyncing with Wine HEAD
svn path=/trunk/; revision=30861
2007-11-29 10:19:56 +00:00
The Wine Synchronizer aa5e4e73cb Autosyncing with Wine HEAD
svn path=/trunk/; revision=29063
2007-09-15 17:06:51 +00:00
The Wine Synchronizer bbc41d3721 Autosyncing with Wine HEAD
svn path=/trunk/; revision=28510
2007-08-24 09:07:34 +00:00
Colin Finck ff30235bb7 Metadata enhancement for rbuild and version report by Marc Piulachs (marc DOT piulachs AT codexchange DOT net)
See issue #2547 for more details.

svn path=/trunk/; revision=28304
2007-08-12 19:17:00 +00:00
The Wine Synchronizer 2513a18ec3 Autosyncing with Wine HEAD
svn path=/trunk/; revision=27903
2007-07-27 09:28:40 +00:00
Johannes Anderwald 9e0537881f - move wine includes to precomp.h
- this enables compiling nearly all (printdlg has some issues) of comdlg32 with msvc (first include all standard headers and then include the wine compability headers)

svn path=/trunk/; revision=25650
2007-01-27 17:52:03 +00:00
Art Yerkes 19208f00eb Rbuild changes for include structure change.
svn path=/trunk/; revision=21124
2006-02-17 22:59:15 +00:00
Maarten Bosma c98d4d6b04 Added all missing rbuild files for reactos/dll
svn path=/trunk/; revision=21111
2006-02-17 20:13:33 +00:00
Renamed from reactos/dll/win32/comdlg32/comdlg32.xml (Browse further)