Piotr Caban piotr@codeweavers.com writes:
dlls/msvcr90/Makefile.in | 32 +- dlls/msvcr90/msvcr90.c | 199 ---- dlls/msvcr90/msvcr90.spec | 2418 ++++++++++++++++++++++----------------------- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/main.c | 4 + dlls/msvcrt/msvcrt.h | 1 + 6 files changed, 1245 insertions(+), 1411 deletions(-) delete mode 100644 dlls/msvcr90/msvcr90.c
It's still broken:
In file included from ../../../wine/dlls/msvcr90/../msvcrt/cpp.c:34:0: ../../../wine/dlls/msvcr90/../msvcrt/cxx.h:23:0: warning: "__thiscall" redefined [enabled by default] <built-in>:0:0: note: this is the location of the previous definition ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1026:32: error: conflicting types for ‘_splitpath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:48:70: note: previous declaration of ‘_splitpath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1126:32: error: conflicting types for ‘_wsplitpath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:57:70: note: previous declaration of ‘_wsplitpath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1423:32: error: conflicting types for ‘_makepath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:44:70: note: previous declaration of ‘_makepath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1527:32: error: conflicting types for ‘_wmakepath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:53:70: note: previous declaration of ‘_wmakepath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1701:32: error: conflicting types for ‘_searchenv_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:46:70: note: previous declaration of ‘_searchenv_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1832:32: error: conflicting types for ‘_wsearchenv_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:55:70: note: previous declaration of ‘_wsearchenv_s’ was here make[1]: *** [dir.o] Error 1