Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[tkreuzer] 50484: [CMAKE] Fix return type of NdrClientCall*

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 25 11:55:45 2011 New Revision: 50484 URL: http://svn.reactos.org/svn/reactos?rev=50484&view=rev Log: [CMAKE] Fix return type of NdrClientCall* Modified: branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c branches/cmake-bringup/include/psdk/rpcndr.h Modified: branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c [iso-8859-1] Tue Jan 25 11:55:45 2011 @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * + * * TODO: Handle non-i386 architectures */ @@ -96,7 +96,7 @@ args[0] = *(const WORD*)(fs + 8); TRACE("(%p)->(%d)([%d bytes]) ret=%08x\n", iface, index, args[0], args[1]); - return NdrClientCall2(stubless->pStubDesc, fs, args + 2); + return NdrClientCall2(stubless->pStubDesc, fs, args + 2).Simple; } #define BLOCK_SIZE 1024 Modified: branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] Tue Jan 25 11:55:45 2011 @@ -510,7 +510,7 @@ } else { - const NDR_PARAM_OI_OTHER *pParamOther = + const NDR_PARAM_OI_OTHER *pParamOther = (const NDR_PARAM_OI_OTHER *)&pFormat[current_offset]; const unsigned char *pTypeFormat = @@ -548,10 +548,7 @@ } } -/* the return type should be CLIENT_CALL_RETURN, but this is incompatible - * with the way gcc returns structures. "void *" should be the largest type - * that MIDL should allow you to return anyway */ -LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, ...) +CLIENT_CALL_RETURN WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, ...) { /* pointer to start of stack where arguments start */ RPC_MESSAGE rpcMsg; @@ -574,7 +571,7 @@ /* -Oif or -Oicf generated format */ BOOL bV2Format = FALSE; /* the value to return to the client from the remote procedure */ - LONG_PTR RetVal = 0; + CLIENT_CALL_RETURN RetVal = {0}; /* the pointer to the object when in OLE mode */ void * This = NULL; PFORMAT_STRING pHandleFormat; @@ -630,7 +627,7 @@ if (!(pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)) { pFormat = client_get_handle(&stubMsg, pProcHeader, pHandleFormat, &hBinding); - if (!pFormat) return 0; + if (!pFormat) return RetVal; } bV2Format = (pStubDesc->Version >= 0x20000); @@ -729,7 +726,7 @@ } __EXCEPT_ALL { - RetVal = NdrProxyErrorHandler(GetExceptionCode()); + RetVal.Simple = NdrProxyErrorHandler(GetExceptionCode()); } __ENDTRY } @@ -830,7 +827,7 @@ client_free_handle(&stubMsg, pProcHeader, pHandleFormat, hBinding); } - TRACE("RetVal = 0x%lx\n", RetVal); + TRACE("RetVal = 0x%p\n", RetVal.Pointer); return RetVal; } @@ -1465,7 +1462,7 @@ pRpcMsg->BufferLength = stubMsg.BufferLength; /* allocate buffer for [out] and [ret] params */ - Status = I_RpcGetBuffer(pRpcMsg); + Status = I_RpcGetBuffer(pRpcMsg); if (Status) RpcRaiseException(Status); stubMsg.Buffer = pRpcMsg->Buffer; Modified: branches/cmake-bringup/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpcn… ============================================================================== --- branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] Tue Jan 25 11:55:45 2011 @@ -650,15 +650,13 @@ RPCRTAPI unsigned char* RPC_ENTRY NdrUserMarshalSimpleTypeConvert( ULONG *pFlags, unsigned char *pBuffer, unsigned char FormatChar ); -/* Note: this should return a CLIENT_CALL_RETURN, but calling convention for - * returning structures/unions is different between Windows and gcc on i386. */ -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall2( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); -LONG_PTR RPC_VAR_ENTRY +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrDcomAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); RPCRTAPI void RPC_ENTRY

13 years, 7 months

[tkreuzer] 50483: [CRT] Implement __SEH_epilog

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 25 09:33:37 2011 New Revision: 50483 URL: http://svn.reactos.org/svn/reactos?rev=50483&view=rev Log: [CRT] Implement __SEH_epilog Modified: branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s Modified: branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s [iso-8859-1] Tue Jan 25 09:33:37 2011 @@ -103,16 +103,16 @@ /* Safe SEH table, overwriting OLDFRAME.ReturnAddress */ mov [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_SEHTable], eax + /* Safe the disable value, overwriting OLDFRAME.SEHTable */ + mov dword ptr [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_Disable], -1 + + /* Load the address of the new registration record */ + lea eax, [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_PreviousRecord] + /* Save registers */ mov [esp + SAFE_AREA_Edi], edi mov [esp + SAFE_AREA_Esi], esi mov [esp + SAFE_AREA_Ebx], ebx - - /* Load the address of the new registration record */ - lea eax, [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_PreviousRecord] - - /* Safe the disable value, overwriting OLDFRAME.SEHTable */ - mov dword ptr [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_Disable], -1 /* Enqueue the new record */ mov fs:[0], eax @@ -120,4 +120,33 @@ /* Return to the caller */ ret + +PUBLIC __SEH_epilog +__SEH_epilog: + + /* Restore the previous exception registration record */ + mov ecx, [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_PreviousRecord] + mov fs:[0], ecx + + /* Restore saved registers */ + mov edi, [esp + 4 + SAFE_AREA_Edi] + mov esi, [esp + 4 + SAFE_AREA_Esi] + mov ebx, [esp + 4 + SAFE_AREA_Ebx] + + /* Get the return address */ + mov ecx, [esp] + + /* Clean up stack */ + mov esp, ebp + + /* Get previous ebp */ + mov ebp, [esp] + + /* Save return address */ + mov [esp], ecx + + /* Return to the caller */ + ret + + END

13 years, 7 months

[tkreuzer] 50482: [CRT] Implement ms compatible __SEH_prolog

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 25 01:28:41 2011 New Revision: 50482 URL: http://svn.reactos.org/svn/reactos?rev=50482&view=rev Log: [CRT] Implement ms compatible __SEH_prolog Added: branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s (with props) Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Tue Jan 25 01:28:41 2011 @@ -279,15 +279,12 @@ wine/heap.c wine/undname.c) -if(NOT ARCH MATCHES arm) - list(APPEND CRT_SOURCE - except/${ARCH}/seh.s) -endif() - if(ARCH MATCHES i386) list(APPEND CRT_SOURCE except/i386/chkstk_asm.s except/i386/prolog.s + except/i386/seh.s + except/i386/seh_prolog.s except/i386/unwind.c float/i386/clearfp.c float/i386/cntrlfp.c @@ -298,6 +295,7 @@ elseif(ARCH MATCHES amd64) list(APPEND CRT_SOURCE except/amd64/chkstk_asm.s + except/amd64/seh.s float/i386/clearfp.c float/i386/cntrlfp.c float/i386/fpreset.c @@ -470,15 +468,12 @@ wstring/wcsspn.c wstring/wcsstr.c) -if(NOT ARCH MATCHES arm) - list(APPEND LIBCNTPR_SOURCE - except/${ARCH}/chkstk_asm.s - except/${ARCH}/seh.s - setjmp/${ARCH}/setjmp.s) -endif() - if(ARCH MATCHES i386) list(APPEND LIBCNTPR_SOURCE + except/i386/chkstk_asm.s + except/i386/seh.s + except/i386/seh_prolog.s + setjmp/i386/setjmp.s math/i386/alldiv_asm.s math/i386/alldvrm_asm.s math/i386/allmul_asm.s @@ -505,6 +500,9 @@ misc/i386/readcr4.S) elseif(ARCH MATCHES amd64) list(APPEND LIBCNTPR_SOURCE + except/amd64/chkstk_asm.s + except/amd64/seh.s + setjmp/amd64/setjmp.s math/cos.c math/sin.c math/amd64/alldiv.S Added: branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s (added) +++ branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s [iso-8859-1] Tue Jan 25 01:28:41 2011 @@ -1,0 +1,123 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS CRT + * FILE: lib/crt/misc/i386/seh_prolog.S + * PURPOSE: SEH Support for MSVC + * PROGRAMMERS: Timo Kreuzer + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> + +EXTERN __except_handler3:PROC + +/* The very first thing a function compiled with MSVC containing SEH + * will do is call __SEH_prolog like this: + * + * push <Number of stackbytes> + * push <Address of exception handler> + * call __SEH_prolog + * + * When entering the function the stack layout is like this: + * + * esp + 08: OLDFRAME.StackBytes + * esp + 04: OLDFRAME.SEHTable + * esp + 00: OLDFRAME.ReturnAddress + * + * __SEH_prolog will now setup the stack to the following layout: + * + * esp + N + 24: SEH_FRAME.OriginalEbp OLDFRAME.StackBytes + * esp + N + 20: SEH_FRAME.Disable OLDFRAME.SEHTable + * esp + N + 1C: SEH_FRAME.SEHTable OLDFRAME.ReturnAddress + * esp + N + 18: SEH_FRAME.Handler + * esp + N + 14: SEH_FRAME.PreviousRecord + * esp + N + 10: SEH_FRAME.unused + * esp + N + 0c: SEH_FRAME.NewEsp + * + * N bytes local variables + * ... + * esp + 08: SAFE_AREA.Ebx + * esp + 04: SAFE_AREA.Esi + * esp + 00: SAFE_AREA.Edi + * + * all this is documented here (with some minor errors): + * http://reactos-blog.blogspot.com/2009/08/inside-mind-of-reactos-developer.h… + */ + +OLDFRAME_ReturnAddress = 0 /* 0x00 */ +OLDFRAME_SEHTable = 4 /* 0x04 */ +OLDFRAME_StackBytes = 8 /* 0x08 */ +OLDFRAME_Size = 12 /* 0x0c */ + +SEH_FRAME_NewEsp = 0 /* 0x00 */ +SEH_FRAME_unused = 4 /* 0x04 */ +SEH_FRAME_PreviousRecord = 8 /* 0x08 */ +SEH_FRAME_Handler = 12 /* 0x0c */ +SEH_FRAME_SEHTable = 16 /* 0x10 */ +SEH_FRAME_Disable = 20 /* 0x14 */ +SEH_FRAME_OriginalEbp = 24 /* 0x18 */ +SEH_FRAME_Size = 28 /* 0x1c */ + +SAFE_AREA_Edi = 0 /* 0x00 */ +SAFE_AREA_Esi = 4 /* 0x04 */ +SAFE_AREA_Ebx = 8 /* 0x08 */ +SAFE_AREA_Size = 12 /* 0x0c */ + + +.code + +PUBLIC __SEH_prolog +__SEH_prolog: + + /* Get the number of stack bytes to reserve */ + mov eax, [esp + OLDFRAME_StackBytes] + + /* Push address of __except_handler3 on the stack */ + push offset __except_handler3 + + /* Push the old exception record on the stack */ + push dword ptr fs:0 + + /* Adjust stack allocation, add size of the stack frame minus 2 pushes */ + add eax, SEH_FRAME_Size + SAFE_AREA_Size - OLDFRAME_Size - 8 + + /* Save old ebp, overwriting OLDFRAME.StackBytes */ + mov [esp + 8 + OLDFRAME_StackBytes], ebp + + /* Load new ebp, pointing to OLDFRAME.StackBytes */ + lea ebp, [esp + 8 + OLDFRAME_StackBytes] + + /* Allocate stack space */ + sub esp, eax + + /* Push the return address on the stack */ + push dword ptr [ebp - OLDFRAME_StackBytes + OLDFRAME_ReturnAddress] + + /* Get address of the SEH table */ + mov eax, [ebp + OLDFRAME_SEHTable] + + /* Save new esp */ + mov [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_NewEsp], esp + + /* Safe SEH table, overwriting OLDFRAME.ReturnAddress */ + mov [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_SEHTable], eax + + /* Save registers */ + mov [esp + SAFE_AREA_Edi], edi + mov [esp + SAFE_AREA_Esi], esi + mov [esp + SAFE_AREA_Ebx], ebx + + /* Load the address of the new registration record */ + lea eax, [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_PreviousRecord] + + /* Safe the disable value, overwriting OLDFRAME.SEHTable */ + mov dword ptr [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_Disable], -1 + + /* Enqueue the new record */ + mov fs:[0], eax + + /* Return to the caller */ + ret + +END Propchange: branches/cmake-bringup/lib/sdk/crt/except/i386/seh_prolog.s ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 7 months

[tkreuzer] 50481: [CMAKE] Fix rostests after changing macros

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 24 21:20:04 2011 New Revision: 50481 URL: http://svn.reactos.org/svn/reactos?rev=50481&view=rev Log: [CMAKE] Fix rostests after changing macros Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt trunk/rostests/winetests/rpcrt4/CMakeLists.txt Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeL… ============================================================================== --- trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] Mon Jan 24 21:20:04 2011 @@ -8,8 +8,8 @@ add_typelib(oleaut32_typelibs test_reg.idl test_tlb.idl tmarshal.idl) add_dependencies(oleaut32_typelibs stdole2) -add_interface_definitions(oleaut32_idlheaders test_reg.idl tmarshal.idl) -add_idl_interface(tmarshal.idl) +add_idl_Headers(oleaut32_idlheaders test_reg.idl tmarshal.idl) +generate_idl_iids(tmarshal.idl) list(APPEND SOURCE dispatch.c Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Mon Jan 24 21:20:04 2011 @@ -6,7 +6,7 @@ -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) -idl_files(server.idl) +add_rpc_library(serverrpc server.idl) list(APPEND SOURCE cstub.c @@ -22,8 +22,7 @@ target_link_libraries(rpcrt4_winetest uuid wine - server_server - server_client + serverrpc ${PSEH_LIB}) set_module_type(rpcrt4_winetest win32cui)

13 years, 7 months

[tkreuzer] 50480: [NTDLL] Fix some exports by marking them as fastcall instead of prepending an @ to the name

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 24 20:24:35 2011 New Revision: 50480 URL: http://svn.reactos.org/svn/reactos?rev=50480&view=rev Log: [NTDLL] Fix some exports by marking them as fastcall instead of prepending an @ to the name Modified: branches/cmake-bringup/dll/ntdll/def/ntdll.spec Modified: branches/cmake-bringup/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/def/ntd… ============================================================================== --- branches/cmake-bringup/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/def/ntdll.spec [iso-8859-1] Mon Jan 24 20:24:35 2011 @@ -1,24 +1,24 @@ -;@ stdcall A_SHAFinal ; 6.0 and higher -;@ stdcall A_SHAInit ; 6.0 and higher -;@ stdcall A_SHAUpdate ; 6.0 and higher -;@ stdcall AitFireParentUsageEvent ; 6.1 and higher -;@ stdcall AitLogFeatureUsageByApp ; 6.1 and higher -;@ stdcall AlpcAdjustCompletionListConcurrencyCount ; 6.0 and higher -;@ stdcall AlpcFreeCompletionListMessage ; 6.0 and higher -;@ stdcall AlpcGetCompletionListLastMessageInformation ; 6.0 and higher -;@ stdcall AlpcGetCompletionListMessageAttributes ; 6.0 and higher -;@ stdcall AlpcGetHeaderSize ; 6.0 and higher -;@ stdcall AlpcGetMessageAttribute ; 6.0 and higher -;@ stdcall AlpcGetMessageFromCompletionList ; 6.0 and higher -;@ stdcall AlpcGetOutstandingCompletionListMessageCount ; 6.0 and higher -;@ stdcall AlpcInitializeMessageAttribute ; 6.0 and higher -;@ stdcall AlpcMaxAllowedMessageLength ; 6.0 and higher -;@ stdcall AlpcRegisterCompletionList ; 6.0 and higher -;@ stdcall AlpcRegisterCompletionListWorkerThread ; 6.0 and higher -;@ stdcall AlpcRundownCompletionList ; 6.1 and higher -;@ stdcall AlpcUnregisterCompletionList ; 6.0 and higher -;@ stdcall AlpcUnregisterCompletionListWorkerThread ; 6.0 and higher +;@ stdcall A_SHAFinal ; 6.0 and higher +;@ stdcall A_SHAInit ; 6.0 and higher +;@ stdcall A_SHAUpdate ; 6.0 and higher +;@ stdcall AitFireParentUsageEvent ; 6.1 and higher +;@ stdcall AitLogFeatureUsageByApp ; 6.1 and higher +;@ stdcall AlpcAdjustCompletionListConcurrencyCount ; 6.0 and higher +;@ stdcall AlpcFreeCompletionListMessage ; 6.0 and higher +;@ stdcall AlpcGetCompletionListLastMessageInformation ; 6.0 and higher +;@ stdcall AlpcGetCompletionListMessageAttributes ; 6.0 and higher +;@ stdcall AlpcGetHeaderSize ; 6.0 and higher +;@ stdcall AlpcGetMessageAttribute ; 6.0 and higher +;@ stdcall AlpcGetMessageFromCompletionList ; 6.0 and higher +;@ stdcall AlpcGetOutstandingCompletionListMessageCount ; 6.0 and higher +;@ stdcall AlpcInitializeMessageAttribute ; 6.0 and higher +;@ stdcall AlpcMaxAllowedMessageLength ; 6.0 and higher +;@ stdcall AlpcRegisterCompletionList ; 6.0 and higher +;@ stdcall AlpcRegisterCompletionListWorkerThread ; 6.0 and higher +;@ stdcall AlpcRundownCompletionList ; 6.1 and higher +;@ stdcall AlpcUnregisterCompletionList ; 6.0 and higher +;@ stdcall AlpcUnregisterCompletionListWorkerThread ; 6.0 and higher @ stdcall CsrAllocateCaptureBuffer(long long) ;@ stdcall CsrAllocateCapturePointer ; NT3, NT4 only @ stdcall CsrAllocateMessagePointer(ptr long ptr) @@ -116,7 +116,7 @@ @ stdcall NtAccessCheckByTypeResultListAndAuditAlarmByHandle(ptr ptr ptr ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) @ stdcall NtAddAtom(ptr long ptr) @ stdcall NtAddBootEntry(ptr long) -@ stdcall NtAddDriverEntry(ptr long) ; 5.2 and higher +@ stdcall NtAddDriverEntry(ptr long) ; 5.2 and higher @ stdcall NtAdjustGroupsToken(long long ptr long ptr ptr) @ stdcall NtAdjustPrivilegesToken(long long long long long long) @ stdcall NtAlertResumeThread(long ptr) @@ -590,7 +590,7 @@ @ stdcall RtlEnumerateGenericTableLikeADirectory(ptr ptr ptr long ptr ptr ptr) @ stdcall RtlEnumerateGenericTableWithoutSplaying(ptr ptr) @ stdcall RtlEnumerateGenericTableWithoutSplayingAvl(ptr ptr) -;@ stdcall RtlEnumerateProperties ; 4.0 only +;@ stdcall RtlEnumerateProperties ; 4.0 only @ stdcall RtlEqualComputerName(ptr ptr) @ stdcall RtlEqualDomainName(ptr ptr) @ stdcall RtlEqualLuid(ptr ptr) @@ -629,7 +629,7 @@ ;@ stdcall RtlFindSetRuns(ptr ptr long long) @ stdcall RtlFirstEntrySList(ptr) @ stdcall RtlFirstFreeAce(ptr ptr) -;@ stdcall RtlFlushPropertySet ; 4.0 only +;@ stdcall RtlFlushPropertySet ; 4.0 only @ stdcall RtlFlushSecureMemoryCache(ptr ptr) @ stdcall RtlFormatCurrentUserKeyPath(ptr) @ stdcall RtlFormatMessage(ptr long long long long ptr ptr long) @@ -684,7 +684,7 @@ ;@ stdcall RtlGetUnloadEventTrace @ stdcall RtlGetUserInfoHeap(ptr long ptr ptr ptr) @ stdcall RtlGetVersion(ptr) -;@ stdcall RtlGuidToPropertySetName ; 4.0 only +;@ stdcall RtlGuidToPropertySetName ; 4.0 only @ stdcall RtlHashUnicodeString(ptr long long ptr) @ stdcall RtlIdentifierAuthoritySid(ptr) @ stdcall RtlImageDirectoryEntryToData(long long long ptr) @@ -924,8 +924,8 @@ ;@ stdcall RtlTraceDatabaseUnlock ;@ stdcall RtlTraceDatabaseValidate @ stdcall RtlTryEnterCriticalSection(ptr) -@ stdcall -arch=i386 @RtlUlongByteSwap(long) -@ stdcall -ret64 @RtlUlonglongByteSwap(double) +@ fastcall -arch=i386 RtlUlongByteSwap(long) +@ fastcall -ret64 RtlUlonglongByteSwap(double) ;@ stdcall RtlUnhandledExceptionFilter2 @ stdcall RtlUnhandledExceptionFilter(ptr) ;@ stdcall RtlUnicodeStringToAnsiSize(ptr) @@ -956,7 +956,7 @@ @ stdcall RtlUpperChar(long) @ stdcall RtlUpperString(ptr ptr) @ stdcall RtlUsageHeap(ptr long ptr) -@ stdcall -arch=i386 @RtlUshortByteSwap(long) +@ fastcall -arch=i386 RtlUshortByteSwap(long) @ stdcall RtlValidAcl(ptr) @ stdcall RtlValidRelativeSecurityDescriptor(ptr long long) @ stdcall RtlValidSecurityDescriptor(ptr)

13 years, 7 months

[tkreuzer] 50479: [CRT] compile memcmp, abs and labs on MSVC, too.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 24 19:50:01 2011 New Revision: 50479 URL: http://svn.reactos.org/svn/reactos?rev=50479&view=rev Log: [CRT] compile memcmp, abs and labs on MSVC, too. Modified: branches/cmake-bringup/lib/sdk/crt/math/abs.c branches/cmake-bringup/lib/sdk/crt/math/labs.c branches/cmake-bringup/lib/sdk/crt/mem/memcmp.c Modified: branches/cmake-bringup/lib/sdk/crt/math/abs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/abs.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/abs.c [iso-8859-1] Mon Jan 24 19:50:01 2011 @@ -1,6 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#ifndef _MSC_VER /* * @implemented */ @@ -9,4 +8,3 @@ { return j<0 ? -j : j; } -#endif Modified: branches/cmake-bringup/lib/sdk/crt/math/labs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/labs.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/labs.c [iso-8859-1] Mon Jan 24 19:50:01 2011 @@ -1,6 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#ifndef _MSC_VER /* * @implemented */ @@ -9,4 +8,3 @@ { return j<0 ? -j : j; } -#endif Modified: branches/cmake-bringup/lib/sdk/crt/mem/memcmp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/mem/m… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/mem/memcmp.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/mem/memcmp.c [iso-8859-1] Mon Jan 24 19:50:01 2011 @@ -1,8 +1,6 @@ /* * $Id$ */ - -#ifndef _MSC_VER #include <string.h> @@ -17,5 +15,3 @@ } return 0; } - -#endif

13 years, 7 months

[tkreuzer] 50478: [CMAKE] Refactor IDL compilation: - Move all macros to idl-support.cmake - Make rpc proxy a static library, instead of fiddeling with SOURCE variable - Merge client and server rpc...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 24 18:13:40 2011 New Revision: 50478 URL: http://svn.reactos.org/svn/reactos?rev=50478&view=rev Log: [CMAKE] Refactor IDL compilation: - Move all macros to idl-support.cmake - Make rpc proxy a static library, instead of fiddeling with SOURCE variable - Merge client and server rpc libraries into one library - Reorder global makelist file a little - Improve configure script - Improve naming, use add_* when a target is added, generate_* when only a file is generated - Don't compile wbemcli.idl on MSVC (temp hack) - Don't compile rossym on MSVC, we don't use it - Use ml64 as assembler when compiling for amd64 - fix spec2def invocation Added: branches/cmake-bringup/cmake/idl-support.cmake (with props) Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/base/services/eventlog/CMakeLists.txt branches/cmake-bringup/base/services/rpcss/CMakeLists.txt branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt branches/cmake-bringup/base/system/services/CMakeLists.txt branches/cmake-bringup/configure.cmd branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/atl/CMakeLists.txt branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt branches/cmake-bringup/dll/win32/msi/CMakeLists.txt branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt branches/cmake-bringup/dll/win32/sti/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/include/dxsdk/CMakeLists.txt branches/cmake-bringup/include/psdk/CMakeLists.txt branches/cmake-bringup/include/reactos/idl/CMakeLists.txt branches/cmake-bringup/include/reactos/wine/CMakeLists.txt branches/cmake-bringup/lib/rossym/CMakeLists.txt branches/cmake-bringup/msc.cmake branches/cmake-bringup/toolchain-mingw32.cmake branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -7,6 +7,14 @@ # Don't escape preprocessor definition values added via add_definitions cmake_policy(SET CMP0005 OLD) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) +set(CMAKE_SHARED_LIBRARY_PREFIX "") +set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) +set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) +set(CMAKE_COLOR_MAKEFILE OFF) +set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) if(NOT ARCH) set(ARCH i386) @@ -22,6 +30,8 @@ include(config-arm.cmake) endif() +add_definitions(-D__REACTOS__) + if(NOT CMAKE_CROSSCOMPILING) add_definitions(-DTARGET_${ARCH}) @@ -51,41 +61,7 @@ else() - if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR) - set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build) - endif() - - set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables") - include(${IMPORT_EXECUTABLES}) - -endif() - -# Compiler specific definitions and macros -if(MSVC) - include(msc.cmake) -else() - include(gcc.cmake) -endif() - -# Generic macros -include(CMakeMacros.cmake) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) -set(CMAKE_SHARED_LIBRARY_PREFIX "") - -set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) -set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) - -set(CMAKE_COLOR_MAKEFILE OFF) - -set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) - -add_definitions(-D__REACTOS__) - -if(CMAKE_CROSSCOMPILING) - - #Some cleanup + # Do some cleanup file(REMOVE ${REACTOS_BINARY_DIR}/dependencies.graphml ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt @@ -95,6 +71,26 @@ ${REACTOS_BINARY_DIR}/boot/ros_cab.txt ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt) + if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR) + set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build) + endif() + + set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables") + include(${IMPORT_EXECUTABLES}) + + # Compiler specific definitions and macros + if(MSVC) + include(msc.cmake) + else() + include(gcc.cmake) + endif() + + # Generic macros + include(CMakeMacros.cmake) + + # IDL macros for widl/midl + include(cmake/idl-support.cmake) + #Some useful variables set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd") set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd") @@ -118,7 +114,11 @@ endif() # Version Options - add_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502 -D_WIN32_WINDOWS=0x502 -D_SETUPAPI_VER=0x502) + add_definitions(-DWINVER=0x502 + -D_WIN32_IE=0x600 + -D_WIN32_WINNT=0x502 + -D_WIN32_WINDOWS=0x502 + -D_SETUPAPI_VER=0x502) # Arch Options if(ARCH MATCHES i386) Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -31,40 +31,6 @@ endmacro() endif() - -macro(idl_compile_object OBJECT SOURCE) - get_property(FLAGS SOURCE ${SOURCE} PROPERTY COMPILE_FLAGS) - get_property(DEFINES SOURCE ${SOURCE} PROPERTY COMPILE_DEFINITIONS) - get_property(INCLUDE_DIRECTORIES DIRECTORY PROPERTY INCLUDE_DIRECTORIES) - - foreach(DIR ${INCLUDE_DIRECTORIES}) - set(FLAGS "${FLAGS} -I${DIR}") - endforeach() - - set(IDL_COMMAND ${CMAKE_IDL_COMPILE_OBJECT}) - string(REPLACE "<CMAKE_IDL_COMPILER>" "${CMAKE_IDL_COMPILER}" IDL_COMMAND "${IDL_COMMAND}") - string(REPLACE <FLAGS> "${FLAGS}" IDL_COMMAND "${IDL_COMMAND}") - string(REPLACE "<DEFINES>" "${DEFINES}" IDL_COMMAND "${IDL_COMMAND}") - string(REPLACE "<OBJECT>" "${OBJECT}" IDL_COMMAND "${IDL_COMMAND}") - string(REPLACE "<SOURCE>" "${SOURCE}" IDL_COMMAND "${IDL_COMMAND}") - separate_arguments(IDL_COMMAND) - - add_custom_command( - OUTPUT ${OBJECT} - COMMAND ${IDL_COMMAND} - DEPENDS ${SOURCE} - VERBATIM) -endmacro() - -macro(add_interface_definitions TARGET) - foreach(SOURCE ${ARGN}) - get_filename_component(FILE ${SOURCE} NAME_WE) - set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.h) - idl_compile_object(${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}) - list(APPEND OBJECTS ${OBJECT}) - endforeach() - add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) -endmacro() macro(add_minicd_target _targetname _dir) # optional parameter: _nameoncd if("${ARGN}" STREQUAL "") @@ -151,97 +117,6 @@ add_livecd(${FILENAME} ${_dir}) endmacro() -macro(custom_incdefs) - if(NOT DEFINED result_incs) #rpc_defines - get_directory_property(rpc_defines COMPILE_DEFINITIONS) - get_directory_property(rpc_includes INCLUDE_DIRECTORIES) - - foreach(arg ${rpc_defines}) - set(result_defs ${result_defs} -D${arg}) - endforeach() - - foreach(arg ${rpc_includes}) - set(result_incs -I${arg} ${result_incs}) - endforeach() - endif() -endmacro() - -macro(rpcproxy TARGET) - custom_incdefs() - list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c) - - foreach(_in_FILE ${ARGN}) - get_filename_component(FILE ${_in_FILE} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c - COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${IDL_PROXY_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c - PROPERTIES GENERATED TRUE) - list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) - list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl) - endforeach() - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c - COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_DLLDATA_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS} - DEPENDS ${IDLS}) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c - PROPERTIES GENERATED TRUE) -endmacro() - -macro(idl_files) - custom_incdefs() - foreach(_in_FILE ${ARGN}) - get_filename_component(FILE ${_in_FILE} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c - COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${IDL_SERVER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl - DEPENDS ${_in_file}) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c - PROPERTIES GENERATED TRUE) - add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) - add_dependencies(${FILE}_server psdk) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c - COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${IDL_CLIENT_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl - DEPENDS ${_in_file}) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c - PROPERTIES GENERATED TRUE) - add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) - add_dependencies(${FILE}_client psdk) - endforeach() -endmacro() - -macro(add_typelib TARGET) - custom_incdefs() - foreach(SOURCE ${ARGN}) - get_filename_component(FILE ${SOURCE} NAME_WE) - set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb - COMMAND ${IDL_COMPILER} ${result_incs} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} - DEPENDS ${SOURCE}) - list(APPEND OBJECTS ${OBJECT}) - endforeach() - add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) -endmacro() - -macro(add_idl_interface IDL_FILE) - custom_incdefs() - get_filename_component(FILE ${IDL_FILE} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c - COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_INTERFACE_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} - DEPENDS ${IDL_FILE}) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c PROPERTIES GENERATED TRUE) -endmacro() - macro(add_dependency_node _node) if(GENERATE_DEPENDENCY_GRAPH) get_target_property(_type ${_node} TYPE) Modified: branches/cmake-bringup/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/eve… ============================================================================== --- branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -12,7 +12,7 @@ add_executable(eventlog ${CMAKE_CURRENT_BINARY_DIR}/eventlog_eventlog.h.gch ${SOURCE}) -target_link_libraries(eventlog eventlogrpc_server ${PSEH_LIB}) +target_link_libraries(eventlog eventlogrpc ${PSEH_LIB}) add_pch(eventlog ${CMAKE_CURRENT_SOURCE_DIR}/eventlog.h ${SOURCE}) Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -12,7 +12,7 @@ add_executable(rpcss ${SOURCE}) -target_link_libraries(rpcss epm_server irot_server ${PSEH_LIB} wine) +target_link_libraries(rpcss epmrpc irotrpc ${PSEH_LIB} wine) set_module_type(rpcss win32cui) Modified: branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/ump… ============================================================================== --- branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -7,7 +7,7 @@ add_definitions(-D_WIN32_WINNT=0x600) add_executable(umpnpmgr umpnpmgr.c umpnpmgr.rc) -target_link_libraries(umpnpmgr pnp_server wdmguid ${PSEH_LIB}) +target_link_libraries(umpnpmgr pnprpc wdmguid ${PSEH_LIB}) set_module_type(umpnpmgr win32cui) add_importlibs(umpnpmgr advapi32 rpcrt4 userenv msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/wla… ============================================================================== --- branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -4,7 +4,7 @@ add_executable(wlansvc wlansvc.c rpcserver.c) -target_link_libraries(wlansvc wlansvc_server ${PSEH_LIB}) +target_link_libraries(wlansvc wlansvcrpc ${PSEH_LIB}) set_module_type(wlansvc win32cui) add_importlibs(wlansvc advapi32 rpcrt4 iphlpapi msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… ============================================================================== --- branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -17,7 +17,7 @@ add_executable(services ${CMAKE_CURRENT_BINARY_DIR}/services_services.h.gch ${SOURCE}) target_link_libraries(services - svcctl_server + svcctlrpc ${PSEH_LIB}) add_pch(services ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${SOURCE}) Added: branches/cmake-bringup/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/idl-support… ============================================================================== --- branches/cmake-bringup/cmake/idl-support.cmake (added) +++ branches/cmake-bringup/cmake/idl-support.cmake [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -1,0 +1,151 @@ + +#idl files support +if(MSVC) + set(IDL_COMPILER midl) + set(IDL_HEADER_ARG /h) #.h + set(IDL_HEADER_ARG2 /h) #.h + set(IDL_TYPELIB_ARG /tlb) #.tlb + set(IDL_SERVER_ARG /sstub) #.c for stub server library + set(IDL_CLIENT_ARG /cstub) #.c for stub client library + set(IDL_PROXY_ARG /proxy) + set(IDL_INTERFACE_ARG /iid) + if(ARCH MATCHES i386) + set(IDL_FLAGS /win32) + elseif(ARCH MATCHES amd64) + set(IDL_FLAGS /amd64) + else() + set(IDL_FLAGS "") + endif() +else() + set(IDL_COMPILER native-widl) + set(IDL_HEADER_ARG -h -o) #.h + set(IDL_HEADER_ARG2 -h -H) #.h + set(IDL_TYPELIB_ARG -t -o) #.tlb + set(IDL_SERVER_ARG -s -S) #.c for server library + set(IDL_CLIENT_ARG -c -C) #.c for stub client library + set(IDL_PROXY_ARG -p -P) + set(IDL_INTERFACE_ARG -u -o) + if(ARCH MATCHES i386) + set(IDL_FLAGS -m32 --win32) + elseif(ARCH MATCHES amd64) + set(IDL_FLAGS -m64 --win64) + else() + set(IDL_FLAGS "") + endif() +endif() + + +macro(get_includes OUTPUT_VAR) + get_directory_property(_includes INCLUDE_DIRECTORIES) + foreach(arg ${_includes}) + set(${OUTPUT_VAR} -I${arg} ${${OUTPUT_VAR}}) + endforeach() +endmacro() + +macro(get_defines OUTPUT_VAR) + get_directory_property(_defines COMPILE_DEFINITIONS) + foreach(arg ${_defines}) + set(${OUTPUT_VAR} ${${OUTPUT_VAR}} -D${arg}) + endforeach() +endmacro() + +macro(add_typelib TARGET) + get_includes(INCLUDES) + get_defines(DEFINES) + foreach(FILE ${ARGN}) + get_filename_component(NAME ${FILE} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + list(APPEND OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb) + endforeach() + add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) +endmacro() + +macro(add_idl_headers TARGET) + get_includes(INCLUDES) + get_defines(DEFINES) + foreach(FILE ${ARGN}) + get_filename_component(NAME ${FILE} NAME_WE) + set(HEADER ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + list(APPEND HEADERS ${HEADER}) + endforeach() + add_custom_target(${TARGET} ALL DEPENDS ${HEADERS}) +endmacro() + +macro(add_rpcproxy_library TARGET) + get_includes(INCLUDES) + get_defines(DEFINES) + foreach(FILE ${ARGN}) + get_filename_component(NAME ${FILE} NAME_WE) + if(MSVC) + set(IDL_DLLDATA_ARG /dlldata ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c) + else() + set(IDL_DLLDATA_ARG "") + endif() + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${IDL_PROXY_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${IDL_DLLDATA_ARG} ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c + PROPERTIES GENERATED TRUE) + list(APPEND rpcproxy_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c) + list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${NAME}.idl) + endforeach() + + if(NOT MSVC) + # Extra pass to generate dlldata for widl + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} --dlldata-only -o ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS} + DEPENDS ${IDLS}) + endif() + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c + PROPERTIES GENERATED TRUE) + add_library(${TARGET} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${rpcproxy_SOURCES}) +endmacro() + +macro(add_rpc_library TARGET) + get_includes(INCLUDES) + get_defines(DEFINES) + foreach(FILE ${ARGN}) + get_filename_component(NAME ${FILE} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h ${IDL_SERVER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c + PROPERTIES GENERATED TRUE) + list(APPEND server_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${IDL_CLIENT_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c + PROPERTIES GENERATED TRUE) + list(APPEND client_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c) + endforeach() + add_library(${TARGET} ${server_SOURCES} ${client_SOURCES}) + add_dependencies(${TARGET} psdk) +endmacro() + +macro(generate_idl_iids IDL_FILE) + get_includes(INCLUDES) + get_defines(DEFINES) + get_filename_component(NAME ${IDL_FILE} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_INTERFACE_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c PROPERTIES GENERATED TRUE) +endmacro() Propchange: branches/cmake-bringup/cmake/idl-support.cmake ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev… ============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -11,9 +11,11 @@ ) if not "%DDK_TARGET_OS%" == "" ( echo Detected DDK/WDK for %_BUILDARCH% - set ARCH=%_BUILDARCH% if "%_BUILDARCH%" == "x86" ( set ARCH=i386 + ) + if "%_BUILDARCH%" == "AMD64" ( + set ARCH=amd64 ) set BUILD_ENVIRONMENT=WDK ) @@ -25,7 +27,9 @@ mkdir host-tools ) cd host-tools -del CMakeCache.txt /q +if EXIST CMakeCache.txt ( + del CMakeCache.txt /q +) set REACTOS_BUILD_TOOLS_DIR=%CD% if "%BUILD_ENVIRONMENT%" == "MINGW" ( cmake -G "MinGW Makefiles" -DARCH=%ARCH% %ROS_SOURCE_DIR% @@ -41,7 +45,9 @@ ) cd reactos -del CMakeCache.txt /q +if EXIST CMakeCache.txt ( + del CMakeCache.txt /q +) if "%BUILD_ENVIRONMENT%" == "MINGW" ( cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% ) Modified: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/quart… ============================================================================== --- branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -14,7 +14,7 @@ spec2def(quartz.dll quartz.spec) -rpcproxy(quartz quartz_strmif.idl) +add_rpcproxy_library(quartzproxy quartz_strmif.idl) list(APPEND SOURCE avidec.c @@ -49,6 +49,7 @@ set_module_type(quartz win32dll) target_link_libraries(quartz + quartzproxy strmiids uuid wine Modified: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprx… ============================================================================== --- branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -4,7 +4,7 @@ spec2def(actxprxy.dll actxprxy.spec) -rpcproxy(actxprxy +add_rpcproxy_library(actxprxylib actxprxy_activscp.idl actxprxy_comcat.idl actxprxy_docobj.idl @@ -25,6 +25,7 @@ set_entrypoint(actxprxy 0) target_link_libraries(actxprxy + actxprxylib uuid wine ${PSEH_LIB}) Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -52,9 +52,9 @@ set_module_type(advapi32 win32dll) target_link_libraries(advapi32 - svcctl_client - lsa_client - eventlogrpc_client + svcctlrpc + lsarpc + eventlogrpc wine ${PSEH_LIB}) Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -6,7 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_interface_definitions(atl_atliface_header atliface.idl) +add_idl_headers(atl_atliface_header atliface.idl) set_rc_compiler() spec2def(atl.dll atl.spec) Modified: branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lsasrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -23,7 +23,7 @@ set_entrypoint(lsasrv 0) target_link_libraries(lsasrv - lsa_server + lsarpc wine ${PSEH_LIB}) Modified: branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml/… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -9,7 +9,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_interface_definitions(mshtml_nsiface_header nsiface.idl) +add_idl_Headers(mshtml_nsiface_header nsiface.idl) set_rc_compiler() Modified: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -7,7 +7,7 @@ spec2def(msi.dll msi.spec) -add_idl_interface(msiserver.idl) +generate_idl_iids(msiserver.idl) list(APPEND SOURCE action.c @@ -60,7 +60,7 @@ add_library(msi SHARED ${SOURCE}) -add_interface_definitions(msi_idlheader msiserver.idl) +add_idl_Headers(msi_idlheader msiserver.idl) add_typelib(msi_tlb msiserver.idl) Modified: branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mstask/… ============================================================================== --- branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -9,7 +9,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_idl_interface(mstask_local.idl) +generate_idl_iids(mstask_local.idl) spec2def(mstask.dll mstask.spec) Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -54,9 +54,9 @@ ${CMAKE_CURRENT_BINARY_DIR} ${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_interface_definitions(ole32idl dcom.idl irot.idl) +add_idl_headers(ole32idl dcom.idl irot.idl) -rpcproxy(ole32 +add_rpcproxy_library(ole32proxy dcom.idl ole32_unknwn.idl ole32_objidl.idl @@ -69,8 +69,9 @@ set_module_type(ole32 win32dll) target_link_libraries(ole32 + ole32proxy wine - irot_client + irotrpc uuid ${PSEH_LIB}) Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3… ============================================================================== --- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -46,13 +46,14 @@ spec2def(oleaut32.dll oleaut32.spec) -rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl) +add_rpcproxy_library(oleaut32proxy oleaut32_oaidl.idl oleaut32_ocidl.idl) add_library(oleaut32 SHARED ${SOURCE}) set_module_type(oleaut32 win32dll) target_link_libraries(oleaut32 + oleaut32proxy wine wineldr uuid Modified: branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgr/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -2,7 +2,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_idl_interface(qmgr_local.idl) +generate_idl_iids(qmgr_local.idl) spec2def(qmgr.dll qmgr.spec) @@ -21,7 +21,7 @@ add_library(qmgr SHARED ${SOURCE}) -add_interface_definitions(qmgr_idlheader qmgr_local.idl) +add_idl_headers(qmgr_idlheader qmgr_local.idl) set_module_type(qmgr win32dll) target_link_libraries(qmgr uuid wine) Modified: branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgrprx… ============================================================================== --- branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_idl_interface(qmgrprxy.idl) +generate_idl_iids(qmgrprxy.idl) spec2def(qmgrprxy.dll qmgrprxy.spec) @@ -14,11 +14,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_i.c ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy.def) -rpcproxy(qmgrprxy qmgrprxy.idl) +add_rpcproxy_library(qmgrprxylib qmgrprxy.idl) add_library(qmgrprxy SHARED ${SOURCE}) set_module_type(qmgrprxy win32dll) -target_link_libraries(qmgrprxy ${PSEH_LIB} wine) +target_link_libraries(qmgrprxy qmgrprxylib ${PSEH_LIB} wine) add_importlibs(qmgrprxy rpcrt4 msvcrt kernel32 ntdll) add_cab_target(qmgrprxy 1) Modified: branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -43,7 +43,7 @@ target_link_libraries(rpcrt4 wine uuid - epm_client + epmrpc ${PSEH_LIB}) add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap… ============================================================================== --- branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -40,7 +40,7 @@ set_module_type(setupapi win32dll) target_link_libraries(setupapi - pnp_client + pnprpc uuid wine ${PSEH_LIB}) Modified: branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… ============================================================================== --- branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -12,7 +12,7 @@ ${REACTOS_SOURCE_DIR}/lib/recyclebin ${REACTOS_SOURCE_DIR}) -add_idl_interface(shobjidl_local.idl) +generate_idl_iids(shobjidl_local.idl) spec2def(shell32.dll shell32.spec) Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -18,13 +18,14 @@ sti_main.c ${CMAKE_CURRENT_BINARY_DIR}/sti.def) -rpcproxy(sti sti_wia.idl) +add_rpcproxy_library(stiproxy sti_wia.idl) add_library(sti SHARED ${SOURCE}) set_entrypoint(sti 0) target_link_libraries(sti + stiproxy wine uuid ${PSEH_LIB}) Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/… ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -8,7 +8,7 @@ spec2def(urlmon.dll urlmon.spec) -rpcproxy(urlmon urlmon_urlmon.idl) +add_rpcproxy_library(urlmonproxy urlmon_urlmon.idl) list(APPEND SOURCE bindctx.c @@ -42,6 +42,7 @@ set_module_type(urlmon win32dll) target_link_libraries(urlmon + urlmonproxy uuid wine ${PSEH_LIB}) Modified: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -12,7 +12,7 @@ set_entrypoint(wlanapi 0) target_link_libraries(wlanapi - wlansvc_client + wlansvcrpc wine ${PSEH_LIB}) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=504… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -1,5 +1,3 @@ - -if(CMAKE_CROSSCOMPILING) # Linking if(ARCH MATCHES i386) @@ -317,5 +315,3 @@ #pseh lib, needed with mingw set(PSEH_LIB "pseh") - -endif(CMAKE_CROSSCOMPILING) Modified: branches/cmake-bringup/include/dxsdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/dxsdk/CMa… ============================================================================== --- branches/cmake-bringup/include/dxsdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/dxsdk/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -24,4 +24,4 @@ #vmrender.idl ) -add_interface_definitions(dxsdk ${SOURCE}) +add_idl_headers(dxsdk ${SOURCE}) Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -92,7 +92,6 @@ urlmon.idl vmr9.idl # vmrender.idl - wbemcli.idl wia_lh.idl wia_xp.idl winsxs.idl @@ -104,10 +103,11 @@ if(NOT MSVC) list(APPEND SOURCE + wbemcli.idl wincodec.idl wuapi.idl) endif() -add_interface_definitions(psdk ${SOURCE}) +add_idl_headers(psdk ${SOURCE}) add_typelib(stdole2 stdole2.idl) Modified: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -1,15 +1,12 @@ include_directories(.) -list(APPEND SOURCE - eventlogrpc.idl - lsa.idl - svcctl.idl - wlansvc.idl) - -idl_files(${SOURCE}) +add_rpc_library(eventlogrpc eventlogrpc.idl) +add_rpc_library(lsarpc lsa.idl) +add_rpc_library(svcctlrpc svcctl.idl) +add_rpc_library(wlansvcrpc wlansvc.idl) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -idl_files(pnp.idl) +add_rpc_library(pnprpc pnp.idl) Modified: branches/cmake-bringup/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -1,9 +1,7 @@ -add_interface_definitions(wineheaders itss.idl wined3d.idl) +add_idl_headers(wineheaders itss.idl wined3d.idl) +add_idl_headers(winesdk epm.idl irot.idl) -list(APPEND SOURCE - epm.idl - irot.idl) +add_rpc_library(epmrpc epm.idl) +add_rpc_library(irotrpc irot.idl) -idl_files(${SOURCE}) -add_interface_definitions(winesdk ${SOURCE}) Modified: branches/cmake-bringup/lib/rossym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -1,4 +1,5 @@ +if(NOT MSVC) add_definitions(-D_NTSYSTEM_) list(APPEND SOURCE delete.c @@ -20,3 +21,4 @@ zwfile.c) add_library(rossym ${SOURCE}) add_dependencies(rossym psdk bugcodes) +endif() Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=504… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -1,11 +1,3 @@ - -if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86") - add_definitions(-D__i386__) -endif() - -add_definitions(-Dinline=__inline) - -if(CMAKE_CROSSCOMPILING) if(OPTIMIZE STREQUAL "1") add_definitions(/O1) @@ -26,6 +18,10 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") +endif() + +if(${ARCH} MATCHES amd64) + add_definitions(-D__x86_64) endif() link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) @@ -137,16 +133,6 @@ # dummy, this workaround is only needed in mingw due to lack of RC support in cmake endmacro() -#idl files support -set(IDL_COMPILER midl) -set(IDL_FLAGS /win32) -set(IDL_HEADER_ARG /h) #.h -set(IDL_TYPELIB_ARG /tlb) #.tlb -set(IDL_SERVER_ARG /sstub) #.c for stub server library -set(IDL_CLIENT_ARG /cstub) #.c for stub client library -set(IDL_PROXY_ARG /proxy) -set(IDL_DLLDATA_ARG /dlldata ) - # Thanks MS for creating a stupid linker macro(add_importlib_target _exports_file) get_filename_component(_name ${_exports_file} NAME_WE) @@ -154,7 +140,7 @@ # Generate the asm stub file and the export def file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def - COMMAND native-spec2def -@ -r -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND native-spec2def --kill-at -r -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) # Assemble the stub file @@ -180,7 +166,7 @@ add_custom_target( lib${_name} DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib) - + add_dependencies(lib${_name} asm ${_dependencies}) endmacro() @@ -195,7 +181,7 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - COMMAND native-spec2def -@ -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def --kill-at -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}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) @@ -222,5 +208,3 @@ #pseh workaround set(PSEH_LIB "") -endif(CMAKE_CROSSCOMPILING) - Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -34,16 +34,6 @@ set(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres) set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") -set(CMAKE_IDL_COMPILER native-widl) - -if(ARCH MATCHES i386) -set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win32 -h -o <OBJECT> <SOURCE>") -elseif(ARCH MATCHES amd64) -set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m64 --win64 -h -o <OBJECT> <SOURCE>") -elseif(ARCH MATCHES arm) -set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -h -o <OBJECT> <SOURCE>") -endif() - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") # Use stdcall fixups, and don't link with anything by default unless we say so Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Mon Jan 24 18:13:40 2011 @@ -6,12 +6,14 @@ # which compilers to use for C and C++ set(CMAKE_C_COMPILER cl) set(CMAKE_CXX_COMPILER cl) -SET(CMAKE_RC_COMPILER rc) -SET(CMAKE_ASM_COMPILER ml) -SET(CMAKE_IDL_COMPILER midl) +set(CMAKE_RC_COMPILER rc) +if(${ARCH} MATCHES amd64) + set(CMAKE_ASM_COMPILER ml64) +else() + set(CMAKE_ASM_COMPILER ml) +endif() -SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") -SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> /win32 /Dstrict_context_handle= /h <OBJECT> <SOURCE>") +set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" @@ -29,3 +31,7 @@ set(CMAKE_BUILD_TYPE "RelwithDebInfo" CACHE STRING "Build Type") set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "") + +if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86") + add_definitions(-D__i386__) +endif()

13 years, 7 months

[fireball] 50477: - Remove undocumented defines from winuser.h and include undocuser.h when _WINE is defined.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jan 24 12:58:51 2011 New Revision: 50477 URL: http://svn.reactos.org/svn/reactos?rev=50477&view=rev Log: - Remove undocumented defines from winuser.h and include undocuser.h when _WINE is defined. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon Jan 24 12:58:51 2011 @@ -16,7 +16,6 @@ #else #define WINUSERAPI #endif - #define FALT 16 #define FCONTROL 8 @@ -1564,9 +1563,6 @@ #define WM_ACTIVATE 6 #define WM_SETFOCUS 7 #define WM_KILLFOCUS 8 -#ifdef _WINE -#define WM_SETVISIBLE 9 -#endif #define WM_ENABLE 10 #define WM_SETREDRAW 11 #define WM_SETTEXT 12 @@ -1953,10 +1949,6 @@ #define EN_VSCROLL 1538 #define LB_ADDFILE 406 #define LB_ADDSTRING 384 -#ifdef _WINE -#define LB_CARETON 419 -#define LB_CARETOFF 420 -#endif #define LB_DELETESTRING 386 #define LB_DIR 397 #define LB_FINDSTRING 399 @@ -2050,9 +2042,6 @@ #define DCX_INTERSECTRGN 128 #define DCX_VALIDATE 0x200000 #define DCX_EXCLUDEUPDATE 0x100 -#ifdef _WINE -#define DCX_USESTYLE 0x10000 -#endif #define GMDI_GOINTOPOPUPS 2 #define GMDI_USEDISABLED 1 #define FKF_AVAILABLE 2 @@ -4917,6 +4906,10 @@ #endif /* UNICODE */ #endif /* RC_INVOKED */ +#ifdef _WINE +#include "reactos/undocuser.h" +#endif + #ifdef _MSC_VER #pragma warning(pop) #endif

13 years, 7 months

[fireball] 50476: [winent.drv] - Add process_detach() routine which performs some required cleanup. - Sync font-related code to the most recent Wine version. - Add back commented out asserts() in w...

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 23 20:19:35 2011 New Revision: 50476 URL: http://svn.reactos.org/svn/reactos?rev=50476&view=rev Log: [winent.drv] - Add process_detach() routine which performs some required cleanup. - Sync font-related code to the most recent Wine version. - Add back commented out asserts() in winent.drv font code. Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/dll/win32/winent.drv/main.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Sun Jan 23 20:19:35 2011 @@ -130,11 +130,11 @@ int best = -1, prev_best = -1, i, prev_i = -1; if(lastfree >= 0) { - //assert(glyphsetCache[lastfree].count == -1); + assert(glyphsetCache[lastfree].count == -1); glyphsetCache[lastfree].count = 1; best = lastfree; lastfree = glyphsetCache[lastfree].next; - //assert(best != mru); + assert(best != mru); glyphsetCache[best].next = mru; mru = best; @@ -159,7 +159,7 @@ glyphsetCache[best].next = mru; mru = best; } else { - //assert(mru == best); + assert(mru == best); } return mru; } @@ -273,7 +273,7 @@ entry = glyphsetCache + ret; entry->lfsz = *plfsz; for( format = 0; format < AA_MAXVALUE; format++ ) { - //assert( !entry->format[format] ); + assert( !entry->format[format] ); } if(antialias && plfsz->lf.lfQuality != NONANTIALIASED_QUALITY) @@ -290,6 +290,7 @@ { case ANTIALIASED_QUALITY: entry->aa_default = get_antialias_type( pdcattr, FALSE, hinter ); + return ret; /* ignore further configuration */ break; case CLEARTYPE_QUALITY: case CLEARTYPE_NATURAL_QUALITY: @@ -317,9 +318,9 @@ static void dec_ref_cache(int index) { - //assert(index >= 0); + assert(index >= 0); TRACE("dec'ing entry %d to %d\n", index, glyphsetCache[index].count - 1); - //assert(glyphsetCache[index].count > 0); + assert(glyphsetCache[index].count > 0); glyphsetCache[index].count--; } @@ -349,12 +350,25 @@ return; } +/*********************************************************************** + * NTDRV_Font_Finalize + */ +void NTDRV_Font_Finalize(void) +{ + int i; + + //EnterCriticalSection(&xrender_cs); + for(i = mru; i >= 0; i = glyphsetCache[i].next) + FreeEntry(i); + //LeaveCriticalSection(&xrender_cs); +} + /************************************************************************ * UploadGlyph * * Helper to ExtTextOut. Must be called inside xrender_cs */ -static BOOL UploadGlyph(PDC_ATTR pdcattr, int glyph, AA_Type format) +static void UploadGlyph(PDC_ATTR pdcattr, int glyph, AA_Type format) { unsigned int buflen; char *buf; @@ -399,8 +413,16 @@ buflen = GetGlyphOutlineW(pdcattr->hdc, glyph, ggo_format, &gm, 0, NULL, &identity); } if(buflen == GDI_ERROR) { - WARN("GetGlyphOutlineW failed\n"); - return FALSE; + WARN("GetGlyphOutlineW failed using default glyph\n"); + buflen = GetGlyphOutlineW(pdcattr->hdc, 0, ggo_format, &gm, 0, NULL, &identity); + if(buflen == GDI_ERROR) { + WARN("GetGlyphOutlineW failed for default glyph trying for space\n"); + buflen = GetGlyphOutlineW(pdcattr->hdc, 0x20, ggo_format, &gm, 0, NULL, &identity); + if(buflen == GDI_ERROR) { + ERR("GetGlyphOutlineW for all attempts unable to upload a glyph\n"); + return; + } + } } TRACE("Turning off antialiasing for this monochrome font\n"); } @@ -408,8 +430,8 @@ /* If there is nothing for the current type, we create the entry. */ if( !entry->format[format] ) { entry->format[format] = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(gsCacheEntryFormat)); + HEAP_ZERO_MEMORY, + sizeof(gsCacheEntryFormat)); } formatEntry = entry->format[format]; @@ -499,8 +521,6 @@ formatEntry->bitmaps[glyph] = buf; formatEntry->gis[glyph] = gi; - - return TRUE; } @@ -517,6 +537,9 @@ lfsz.devsize.cx = RosDrv_XWStoDS( pdcattr, lfsz.lf.lfWidth ); lfsz.devsize.cy = RosDrv_YWStoDS( pdcattr, lfsz.lf.lfHeight ); GetWorldTransform( pdcattr->hdc, &lfsz.xform ); + /* Not used fields, would break hashing */ + lfsz.xform.eDx = lfsz.xform.eDy = 0; + lfsz_calc_hash(&lfsz); /*EnterCriticalSection(&xrender_cs);*/ Modified: branches/arwinss/reactos/dll/win32/winent.drv/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/main.c [iso-8859-1] Sun Jan 23 20:19:35 2011 @@ -57,6 +57,13 @@ return FALSE; } +static void process_detach() +{ + CleanupHandleMapping(); + NTDRV_Font_Finalize(); + DeleteCriticalSection( &NTDRV_CritSection ); +} + /*********************************************************************** * NTDRV initialisation routine */ @@ -76,8 +83,7 @@ //thread_detach(); break; case DLL_PROCESS_DETACH: - CleanupHandleMapping(); - //process_detach(); + process_detach(); break; } return ret; Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Sun Jan 23 20:19:35 2011 @@ -127,6 +127,8 @@ const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ); +void NTDRV_Font_Finalize(void); + /* mouse.c */ void set_window_cursor( HWND hwnd, HCURSOR handle ); @@ -155,3 +157,20 @@ UINT swp_flags, const RECT *old_window_rect, const RECT *old_whole_rect, const RECT *old_client_rect ); SWM_WINDOW_ID create_whole_window( struct ntdrv_win_data *data ); + +/* assert() stuff to avoid linking anything more */ +NTSYSAPI +VOID +NTAPI +RtlAssert( + PVOID FailedAssertion, + PVOID FileName, + ULONG LineNumber, + PCHAR Message +); + +#ifdef assert +#undef assert +#endif +#define assert(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } +

13 years, 7 months

[rmessiant] 50475: [NTOS] - Only update the System Page Directory when expanding the paged pool. Fixes the PointerPde asserts. On paged pool expansion, the system page directory and the process pag...

by rmessiant＠svn.reactos.org

Author: rmessiant Date: Sun Jan 23 19:27:13 2011 New Revision: 50475 URL: http://svn.reactos.org/svn/reactos?rev=50475&view=rev Log: [NTOS] - Only update the System Page Directory when expanding the paged pool. Fixes the PointerPde asserts. On paged pool expansion, the system page directory and the process page directory of the calling process were updated. When updating the process page directory, an assert made sure the PDE that got written was invalid. In case of the System process, both page directories are located on the same physical page. So when this process expanded the paged pool, the system page directory update automagically updated the process page directory too. The assert therefore triggered. Not explicitly updating the process page directory will result in a page fault later on, which is handled by copying the required PDE from the system page directory to the process page directory. Rumour has it this fix is incorrect because "something's wrong with the System PDE stuff". The lack of any further info however leads to this change and explanation. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sun Jan 23 19:27:13 2011 @@ -497,7 +497,7 @@ MmSystemPageDirectory[(PointerPde - MiAddressToPde(NULL)) / PDE_COUNT]); /* Write the actual PDE now */ - MI_WRITE_VALID_PDE(PointerPde, TempPde); +// MI_WRITE_VALID_PDE(PointerPde, TempPde); #endif // // Move on to the next expansion address

13 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
34
Older →

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 January 2011