Ros-diffs April 2012

ros-diffs@reactos.org

11 participants
156 discussions

[tkreuzer] 56454: [OLDNAMES] Fix compilation with amd64 MSVC See issue #7030 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Apr 30 20:26:46 2012 New Revision: 56454 URL: http://svn.reactos.org/svn/reactos?rev=56454&view=rev Log: [OLDNAMES] Fix compilation with amd64 MSVC See issue #7030 for more details. Modified: trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S Modified: trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/oldnames-msvcr… ============================================================================== --- trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S [iso-8859-1] Mon Apr 30 20:26:46 2012 @@ -6,6 +6,7 @@ #define IMPSYM(name) __imp__##name #else #define SYM(name) name +#define IMPSYM(name) __imp_##name #endif MACRO(CREATE_ALIAS1, alias, target)

12 years, 7 months

[spetreolle] 56453: [FUSION] Never ever trust the wine file layout. wine can load a dll when there is no file using builtins, while normal windows dont. This fixes fusion beeing installed in the wr...

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Apr 30 19:14:43 2012 New Revision: 56453 URL: http://svn.reactos.org/svn/reactos?rev=56453&view=rev Log: [FUSION] Never ever trust the wine file layout. wine can load a dll when there is no file using builtins, while normal windows dont. This fixes fusion beeing installed in the wrong places. Loading the 2nd and 3rd copy of fusion fails atm. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/dll/win32/fusion/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Mon Apr 30 19:14:43 2012 @@ -24,9 +24,9 @@ 8 = media 9 = Microsoft.NET 10 = Microsoft.NET\Framework -11 = Microsoft.NET\Framework\v1.1.4322 -12 = Microsoft.NET\Framework\v2.0.50727 -13 = Microsoft.NET\Framework\v4.0.30319 +11 = Microsoft.NET\Framework\v1.0.3705 +12 = Microsoft.NET\Framework\v1.1.4322 +13 = Microsoft.NET\Framework\v2.0.50727 .InfEnd Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Mon Apr 30 19:14:43 2012 @@ -106,11 +106,11 @@ set(${var} 9) elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework) set(${var} 10) + elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.0.3705) + set(${var} 11) elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322) - set(${var} 11) + set(${var} 12) elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727) - set(${var} 12) - elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v4.0.30319) set(${var} 13) else() message(ERROR "Wrong destination: ${dir}") Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Mon Apr 30 19:14:43 2012 @@ -23,6 +23,6 @@ set_module_type(fusion win32dll) target_link_libraries(fusion wine uuid) add_importlibs(fusion shlwapi advapi32 dbghelp user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all) -add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v4.0.30319 FOR all)

12 years, 7 months

[ekohl] 56452: [LSASRV] Implement LsarCreateAccount.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Apr 29 22:09:35 2012 New Revision: 56452 URL: http://svn.reactos.org/svn/reactos?rev=56452&view=rev Log: [LSASRV] Implement LsarCreateAccount. Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Sun Apr 29 22:09:35 2012 @@ -27,7 +27,7 @@ set_module_type(lsasrv win32dll ENTRYPOINT 0 UNICODE) target_link_libraries(lsasrv wine ${PSEH_LIB}) -add_importlibs(lsasrv rpcrt4 msvcrt kernel32 ntdll) +add_importlibs(lsasrv rpcrt4 msvcrt kernel32 advapi32 ntdll) add_pch(lsasrv lsasrv.h) add_dependencies(lsasrv psdk) add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Apr 29 22:09:35 2012 @@ -310,8 +310,65 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *AccountHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + LSAPR_HANDLE AccountsHandle; + LSAPR_HANDLE Account; + LPWSTR SidString; + NTSTATUS Status; + + /* Validate the PolicyHandle */ + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + POLICY_CREATE_ACCOUNT); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + /* Open the Accounts object */ + AccountsHandle = LsapCreateDbObject(PolicyHandle, + L"Accounts", + TRUE, + LsaDbContainerObject, + 0); + if (AccountsHandle == NULL) + { + ERR("LsapCreateDbObject (Accounts) failed\n"); + return STATUS_UNSUCCESSFUL; + } + + /* Create SID string */ + if (!ConvertSidToStringSid((PSID)AccountSid, + &SidString)) + { + ERR("ConvertSidToStringSid failed\n"); + return STATUS_UNSUCCESSFUL; + } + + /* Create the Account object */ + Account = LsapCreateDbObject(AccountsHandle, + SidString, + FALSE, + LsaDbAccountObject, + DesiredAccess); + if (Account != NULL) + { + /* Set the Sid attribute */ + Status = LsapSetObjectAttribute((PLSA_DB_OBJECT)Account, + L"Sid", + (PVOID)AccountSid, + GetLengthSid(AccountSid)); + if (NT_SUCCESS(Status)) + { + *AccountHandle = Account; + } + } + + LocalFree(SidString); + + LsapCloseDbObject(AccountsHandle); + + return STATUS_SUCCESS; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sun Apr 29 22:09:35 2012 @@ -17,8 +17,8 @@ #include <ndk/rtlfuncs.h> #include <ndk/setypes.h> - #include <ntsecapi.h> +#include <sddl.h> #include <string.h>

12 years, 7 months

[ekohl] 56451: [ADVAPI32] Formatting, no code changes.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Apr 29 21:39:32 2012 New Revision: 56451 URL: http://svn.reactos.org/svn/reactos?rev=56451&view=rev Log: [ADVAPI32] Formatting, no code changes. Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] Sun Apr 29 21:39:32 2012 @@ -226,26 +226,26 @@ PSID pPrimaryGroup, LPDWORD lpdwPrimaryGroupSize) { - NTSTATUS Status; - - Status = RtlSelfRelativeToAbsoluteSD (pSelfRelativeSecurityDescriptor, - pAbsoluteSecurityDescriptor, - lpdwAbsoluteSecurityDescriptorSize, - pDacl, - lpdwDaclSize, - pSacl, - lpdwSaclSize, - pOwner, - lpdwOwnerSize, - pPrimaryGroup, - lpdwPrimaryGroupSize); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - return TRUE; + NTSTATUS Status; + + Status = RtlSelfRelativeToAbsoluteSD(pSelfRelativeSecurityDescriptor, + pAbsoluteSecurityDescriptor, + lpdwAbsoluteSecurityDescriptorSize, + pDacl, + lpdwDaclSize, + pSacl, + lpdwSaclSize, + pOwner, + lpdwOwnerSize, + pPrimaryGroup, + lpdwPrimaryGroupSize); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; }

12 years, 7 months

[akhaldi] 56450: [CMAKE] * Remove the toolchain libs since they are no longer needed, now that we have the updated RosBE.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 29 20:22:26 2012 New Revision: 56450 URL: http://svn.reactos.org/svn/reactos?rev=56450&view=rev Log: [CMAKE] * Remove the toolchain libs since they are no longer needed, now that we have the updated RosBE. Removed: trunk/reactos/importlibs/libcoldname.a trunk/reactos/importlibs/libgcc.a trunk/reactos/importlibs/libmingw32.a trunk/reactos/importlibs/libmingwex.a trunk/reactos/importlibs/libsupc++.a trunk/reactos/importlibs/oldnames.lib Removed: trunk/reactos/importlibs/libcoldname.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libcoldname.a?r… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/importlibs/libgcc.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libgcc.a?rev=56… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/importlibs/libmingw32.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libmingw32.a?re… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/importlibs/libmingwex.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libmingwex.a?re… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/importlibs/libsupc++.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libsupc%2B%2B.a… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/importlibs/oldnames.lib URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/oldnames.lib?re… ============================================================================== Binary file - no diff available.

12 years, 7 months

[akhaldi] 56449: [CRT/OLDNAMES] * Treat the oldnames lib as an import lib.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 29 20:04:52 2012 New Revision: 56449 URL: http://svn.reactos.org/svn/reactos?rev=56449&view=rev Log: [CRT/OLDNAMES] * Treat the oldnames lib as an import lib. Modified: trunk/reactos/lib/sdk/crt/oldnames.cmake Modified: trunk/reactos/lib/sdk/crt/oldnames.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/oldnames.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/oldnames.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/oldnames.cmake [iso-8859-1] Sun Apr 29 20:04:52 2012 @@ -1,11 +1,7 @@ if(NOT MSVC) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a - COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) - - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) - - add_custom_target(oldnames ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) + _add_library(oldnames STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def) + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def PROPERTIES EXTERNAL_OBJECT TRUE) + set_target_properties(oldnames PROPERTIES LINKER_LANGUAGE "IMPLIB" PREFIX "") else() add_library(oldnames oldnames-msvcrt.S) endif()

12 years, 7 months

[tkreuzer] 56448: [CMAKE] Autogenerate oldnames for MSVC as well. Currently on gcc builds we use a special def file syntax and use dlltool to create the lib, while on MSVC builds we use an asm file...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 29 19:38:50 2012 New Revision: 56448 URL: http://svn.reactos.org/svn/reactos?rev=56448&view=rev Log: [CMAKE] Autogenerate oldnames for MSVC as well. Currently on gcc builds we use a special def file syntax and use dlltool to create the lib, while on MSVC builds we use an asm file with aliases. Added: trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S (with props) Modified: trunk/reactos/lib/sdk/crt/oldnames.cmake Added: trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/oldnames-msvcr… ============================================================================== --- trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S (added) +++ trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S [iso-8859-1] Sun Apr 29 19:38:50 2012 @@ -1,0 +1,154 @@ + +#include <asm.inc> + +#ifdef _M_IX86 +#define SYM(name) _##name +#define IMPSYM(name) __imp__##name +#else +#define SYM(name) name +#endif + +MACRO(CREATE_ALIAS1, alias, target) +#ifdef _USE_ML + EXTERN SYM(&target):PROC + ALIAS <SYM(&alias)> = <SYM(&target)> +#else + .weakref SYM(&alias), SYM(&target) +#endif +ENDM + +MACRO(CREATE_ALIAS2, alias, target) +#ifdef _USE_ML + EXTERN IMPSYM(&target):PROC + ALIAS <IMPSYM(&alias)> = <IMPSYM(&target)> +#else + .weakref IMPSYM(&alias), IMPSYM(&target) +#endif +ENDM + +MACRO(CREATE_ALIAS, alias, target) + CREATE_ALIAS1 &alias, &target + CREATE_ALIAS2 &alias, &target +ENDM + +CREATE_ALIAS access, _access +CREATE_ALIAS chdir, _chdir +CREATE_ALIAS chmod, _chmod +CREATE_ALIAS chsize, _chsize +CREATE_ALIAS close, _close +CREATE_ALIAS creat, _creat +CREATE_ALIAS cwait, _cwait +CREATE_ALIAS2 daylight, _daylight +CREATE_ALIAS dup, _dup +CREATE_ALIAS dup2, _dup2 +CREATE_ALIAS ecvt, _ecvt +CREATE_ALIAS eof, _eof +CREATE_ALIAS execl, _execl +CREATE_ALIAS execle, _execle +CREATE_ALIAS execlp, _execlp +CREATE_ALIAS execlpe, _execlpe +CREATE_ALIAS execv, _execv +CREATE_ALIAS execve, _execve +CREATE_ALIAS execvp, _execvp +CREATE_ALIAS execvpe, _execvpe +CREATE_ALIAS fcvt, _fcvt +CREATE_ALIAS fdopen, _fdopen +CREATE_ALIAS fgetchar, _fgetchar +CREATE_ALIAS fgetwchar, _fgetwchar +CREATE_ALIAS filelength, _filelength +CREATE_ALIAS fileno, _fileno +CREATE_ALIAS fpreset, _fpreset +CREATE_ALIAS fputchar, _fputchar +CREATE_ALIAS fputwchar, _fputwchar +CREATE_ALIAS fstat, _fstat +CREATE_ALIAS ftime, _ftime +CREATE_ALIAS gcvt, _gcvt +CREATE_ALIAS getch, _getch +CREATE_ALIAS getche, _getche +CREATE_ALIAS getcwd, _getcwd +CREATE_ALIAS getpid, _getpid +CREATE_ALIAS getw, _getw +CREATE_ALIAS heapwalk, _heapwalk +CREATE_ALIAS isatty, _isatty +CREATE_ALIAS itoa, _itoa +CREATE_ALIAS kbhit, _kbhit +CREATE_ALIAS lfind, _lfind +CREATE_ALIAS lsearch, _lsearch +CREATE_ALIAS lseek, _lseek +CREATE_ALIAS ltoa, _ltoa +CREATE_ALIAS memccpy, _memccpy +CREATE_ALIAS memicmp, _memicmp +CREATE_ALIAS mkdir, _mkdir +CREATE_ALIAS mktemp, _mktemp +CREATE_ALIAS open, _open +CREATE_ALIAS pclose, _pclose +CREATE_ALIAS popen, _popen +CREATE_ALIAS putch, _putch +CREATE_ALIAS putenv, _putenv +CREATE_ALIAS putw, _putw +CREATE_ALIAS read, _read +CREATE_ALIAS rmdir, _rmdir +CREATE_ALIAS rmtmp, _rmtmp +CREATE_ALIAS searchenv, _searchenv +CREATE_ALIAS setmode, _setmode +CREATE_ALIAS snprintf, _snprintf +CREATE_ALIAS sopen, _sopen +CREATE_ALIAS spawnl, _spawnl +CREATE_ALIAS spawnle, _spawnle +CREATE_ALIAS spawnlp, _spawnlp +CREATE_ALIAS spawnlpe, _spawnlpe +CREATE_ALIAS spawnv, _spawnv +CREATE_ALIAS spawnve, _spawnve +CREATE_ALIAS spawnvp, _spawnvp +CREATE_ALIAS spawnvpe, _spawnvpe +CREATE_ALIAS stat, _stat +CREATE_ALIAS strcmpi, _strcmpi +CREATE_ALIAS strdup, _strdup +CREATE_ALIAS stricmp, _stricmp +CREATE_ALIAS stricoll, _stricoll +CREATE_ALIAS strlwr, _strlwr +CREATE_ALIAS strnicmp, _strnicmp +CREATE_ALIAS strnset, _strnset +CREATE_ALIAS strrev, _strrev +CREATE_ALIAS strset, _strset +CREATE_ALIAS strupr, _strupr +CREATE_ALIAS swab, _swab +CREATE_ALIAS tell, _tell +CREATE_ALIAS tempnam, _tempnam +CREATE_ALIAS2 timezone, _timezone +CREATE_ALIAS2 tzname, _tzname +CREATE_ALIAS tzset, _tzset +CREATE_ALIAS umask, _umask +CREATE_ALIAS ungetch, _ungetch +CREATE_ALIAS unlink, _unlink +CREATE_ALIAS utime, _utime +CREATE_ALIAS wcsdup, _wcsdup +CREATE_ALIAS wcsicmp, _wcsicmp +CREATE_ALIAS wcsicoll, _wcsicoll +CREATE_ALIAS wcslwr, _wcslwr +CREATE_ALIAS wcsnicmp, _wcsnicmp +CREATE_ALIAS wcsnset, _wcsnset +CREATE_ALIAS wcsrev, _wcsrev +CREATE_ALIAS wcsset, _wcsset +CREATE_ALIAS wcsupr, _wcsupr +CREATE_ALIAS wpopen, _wpopen +CREATE_ALIAS write, _write +// non-ANSI functions declared in math.h +CREATE_ALIAS j0, _j0 +CREATE_ALIAS j1, _j1 +CREATE_ALIAS jn, _jn +CREATE_ALIAS y0, _y0 +CREATE_ALIAS y1, _y1 +CREATE_ALIAS yn, _yn +CREATE_ALIAS chgsign, _chgsign +CREATE_ALIAS scalb, _scalb +CREATE_ALIAS finite, _finite +CREATE_ALIAS fpclass, _fpclass +// C99 functions +CREATE_ALIAS cabs, _cabs +CREATE_ALIAS hypot, _hypot +CREATE_ALIAS logb, _logb +CREATE_ALIAS nextafter, _nextafter + +END + Propchange: trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/oldnames.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/oldnames.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/oldnames.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/oldnames.cmake [iso-8859-1] Sun Apr 29 19:38:50 2012 @@ -6,4 +6,6 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) add_custom_target(oldnames ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) +else() + add_library(oldnames oldnames-msvcrt.S) endif()

12 years, 7 months

[tkreuzer] 56447: [CMAKE] - seperate generation of importlibs from spec2def (generate_import_lib function)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 29 19:04:02 2012 New Revision: 56447 URL: http://svn.reactos.org/svn/reactos?rev=56447&view=rev Log: [CMAKE] - seperate generation of importlibs from spec2def (generate_import_lib function) Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=56447&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Apr 29 19:04:02 2012 @@ -217,11 +217,28 @@ set(DECO_OPTION "-@") endif() +function(generate_import_lib _libname _dllname _spec_file) + # generate the def for the import lib + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def + COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def PROPERTIES EXTERNAL_OBJECT TRUE) + + #create normal importlib + _add_library(${_libname} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def) + set_target_properties(${_libname} PROPERTIES LINKER_LANGUAGE "IMPLIB" PREFIX "") + + #create delayed importlib + _add_library(${_libname}_delayed STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def) + set_target_properties(${_libname}_delayed PROPERTIES LINKER_LANGUAGE "IMPLIB_DELAYED" PREFIX "") +endfunction() + # Cute little hack to produce import libs set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill-at --output-lib=<TARGET>") set(CMAKE_IMPLIB_DELAYED_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill-at --output-delaylib=<TARGET>") function(spec2def _dllname _spec_file) - # do we also want to add impotlib targets? + # do we also want to add importlib targets? if(${ARGC} GREATER 2) if(${ARGN} STREQUAL "ADD_IMPORTLIB") set(__add_importlib TRUE) @@ -245,20 +262,7 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) if(__add_importlib) - # generate the def for the export lib - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def - COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def PROPERTIES EXTERNAL_OBJECT TRUE) - - #create normal importlib - _add_library(lib${_file} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def) - set_target_properties(lib${_file} PROPERTIES LINKER_LANGUAGE "IMPLIB" PREFIX "") - - #create delayed importlib - _add_library(lib${_file}_delayed STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_file}_implib.def) - set_target_properties(lib${_file}_delayed PROPERTIES LINKER_LANGUAGE "IMPLIB_DELAYED" PREFIX "") + generate_import_lib(lib${_file} ${_dllname} ${_spec_file}) endif() endfunction() Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=56447… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Apr 29 19:04:02 2012 @@ -124,6 +124,29 @@ target_link_libraries(${MODULE} delayimp) endmacro() +function(generate_import_lib _libname _dllname _spec_file) + # Generate the asm stub file and the def file for import library + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_exp.def + COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_exp.def -l=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) + + # be clear about the "language" + # Thanks MS for creating a stupid linker + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm PROPERTIES LANGUAGE "STUB_ASM") + + # add our library + # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other + add_library(${_libname} STATIC EXCLUDE_FROM_ALL + ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm) + + add_dependencies(${_libname} ${CMAKE_CURRENT_BINARY_DIR}\\${_libname}_exp.def) + + # set correct "link rule" + set_target_properties(${_libname} PROPERTIES LINKER_LANGUAGE "IMPLIB" + STATIC_LIBRARY_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}\\${_libname}_exp.def") +endfunction() + if(${ARCH} MATCHES amd64) add_definitions(/D__x86_64) set(SPEC2DEF_ARCH x86_64) @@ -154,24 +177,8 @@ COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) - if(__add_importlib) - # Generate the asm stub file and the export def file for import library - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_stubs.asm ${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_exp.def - COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_exp.def -l=${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) - # be clear about the "language" - # Thanks MS for creating a stupid linker - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_stubs.asm PROPERTIES LANGUAGE "STUB_ASM") - - # add our library - # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other - add_library(lib${_file} STATIC EXCLUDE_FROM_ALL - ${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_stubs.asm) - - # set correct "link rule" - set_target_properties(lib${_file} PROPERTIES LINKER_LANGUAGE "IMPLIB" - STATIC_LIBRARY_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}\\lib${_file}_exp.def") + if(__add_importlib) + generate_import_lib(lib${_file} ${_dllname} ${_spec_file}) endif() endfunction()

12 years, 7 months

[tkreuzer] 56446: [LSASRV] Fix another uninitialized variable bug.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 29 12:18:19 2012 New Revision: 56446 URL: http://svn.reactos.org/svn/reactos?rev=56446&view=rev Log: [LSASRV] Fix another uninitialized variable bug. Modified: trunk/reactos/dll/win32/lsasrv/policy.c Modified: trunk/reactos/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/policy.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] Sun Apr 29 12:18:19 2012 @@ -252,7 +252,7 @@ { PLSAPR_POLICY_ACCOUNT_DOM_INFO p = NULL; PUNICODE_STRING DomainName; - ULONG AttributeSize; + ULONG AttributeSize = 0; NTSTATUS Status; *PolicyInformation = NULL;

12 years, 7 months

[tkreuzer] 56445: [LSASRV] Fix return value of LsarQueryAccountDomain

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 29 12:16:34 2012 New Revision: 56445 URL: http://svn.reactos.org/svn/reactos?rev=56445&view=rev Log: [LSASRV] Fix return value of LsarQueryAccountDomain Modified: trunk/reactos/dll/win32/lsasrv/policy.c Modified: trunk/reactos/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/policy.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] Sun Apr 29 12:16:34 2012 @@ -351,7 +351,7 @@ } } - return STATUS_SUCCESS; + return Status; }

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2012