Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49690: [RTL] Add missing Interlocked definition
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 14:40:57 2010 New Revision: 49690 URL: http://svn.reactos.org/svn/reactos?rev=49690&view=rev Log: [RTL] Add missing Interlocked definition Modified: branches/cmake-bringup/lib/rtl/rtl.h Modified: branches/cmake-bringup/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/rtl.h?rev… ============================================================================== --- branches/cmake-bringup/lib/rtl/rtl.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/rtl.h [iso-8859-1] Sun Nov 21 14:40:57 2010 @@ -38,6 +38,7 @@ #define InterlockedIncrement _InterlockedIncrement #define InterlockedDecrement _InterlockedDecrement #define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchange _InterlockedExchange #endif #endif /* RTL_H */

1 0

[tkreuzer] 49689: [SCSIPORT] Convert to spec
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 14:28:52 2010 New Revision: 49689 URL: http://svn.reactos.org/svn/reactos?rev=49689&view=rev Log: [SCSIPORT] Convert to spec Added: branches/cmake-bringup/drivers/storage/scsiport/scsiport.spec - copied, changed from r49669, branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec Removed: branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec Modified: branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt Modified: branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s… ============================================================================== --- branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] Sun Nov 21 14:28:52 2010 @@ -1,5 +1,11 @@ -add_library(scsiport SHARED scsiport.c stubs.c scsiport.rc) +spec2def(scsiport.sys scsiport.spec) + +add_library(scsiport SHARED + scsiport.c + stubs.c + scsiport.rc + ) target_link_libraries(scsiport ${CMAKE_CURRENT_SOURCE_DIR}/scsiport_i386.def) @@ -8,3 +14,4 @@ add_minicd_target(scsiport reactos scsiport.sys) add_livecd_target(scsiport reactos/system32/drivers) +add_importlib_target(scsiport.spec) Removed: branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s… ============================================================================== --- branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec (removed) @@ -1,51 +1,0 @@ -#ifdef __x86_64__ -#define MAYBEFWD(x) -#else -#define MAYBEFWD(x) x -#endif - -@ cdecl ScsiDebugPrint() -@ stdcall ScsiPortCompleteRequest(ptr long long long long) -@ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) -@ stdcall ScsiPortConvertUlongToPhysicalAddress(long) MAYBEFWD(NTOSKRNL.RtlConvertUlongToLargeInteger) -@ stdcall ScsiPortFlushDma(ptr) -@ stdcall ScsiPortFreeDeviceBase(ptr ptr) -@ stdcall ScsiPortGetBusData(ptr long long long ptr long) -@ stdcall ScsiPortGetDeviceBase(ptr long long long long long long) -@ stdcall ScsiPortGetLogicalUnit(ptr long long long) -@ stdcall ScsiPortGetPhysicalAddress(ptr ptr ptr long) -@ stdcall ScsiPortGetSrb(ptr long long long long) -@ stdcall ScsiPortGetUncachedExtension(ptr ptr long) -@ stdcall ScsiPortGetVirtualAddress(ptr long long) -@ stdcall ScsiPortInitialize(ptr ptr ptr ptr) -@ stdcall ScsiPortIoMapTransfer(ptr ptr long long) -@ stdcall ScsiPortLogError(ptr ptr long long long long long) -@ stdcall ScsiPortMoveMemory(ptr ptr long) -@ cdecl ScsiPortNotification() -@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_UCHAR) -@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_USHORT) -@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_ULONG) -@ stdcall ScsiPortReadPortUchar(ptr) MAYBEFWD(HAL.READ_PORT_UCHAR) -@ stdcall ScsiPortReadPortUshort(ptr) MAYBEFWD(HAL.READ_PORT_USHORT) -@ stdcall ScsiPortReadPortUlong(ptr) MAYBEFWD(HAL.READ_PORT_ULONG) -@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_UCHAR) -@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_USHORT) -@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_ULONG) -@ stdcall ScsiPortReadRegisterUchar(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_UCHAR) -@ stdcall ScsiPortReadRegisterUshort(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_USHORT) -@ stdcall ScsiPortReadRegisterUlong(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_ULONG) -@ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long) -@ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor -@ stdcall ScsiPortValidateRange(ptr long long long long long long) -@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_UCHAR) -@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_USHORT) -@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_ULONG) -@ stdcall ScsiPortWritePortUchar(ptr long) MAYBEFWD(HAL.WRITE_PORT_UCHAR) -@ stdcall ScsiPortWritePortUshort(ptr long) MAYBEFWD(HAL.WRITE_PORT_USHORT) -@ stdcall ScsiPortWritePortUlong(ptr long) MAYBEFWD(HAL.WRITE_PORT_ULONG) -@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR) -@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT) -@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG) -@ stdcall ScsiPortWriteRegisterUchar(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_UCHAR) -@ stdcall ScsiPortWriteRegisterUshort(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_USHORT) -@ stdcall ScsiPortWriteRegisterUlong(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_ULONG) Copied: branches/cmake-bringup/drivers/storage/scsiport/scsiport.spec (from r49669, branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec) URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s… ============================================================================== --- branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/scsiport/scsiport.spec [iso-8859-1] Sun Nov 21 14:28:52 2010 @@ -1,13 +1,8 @@ -#ifdef __x86_64__ -#define MAYBEFWD(x) -#else -#define MAYBEFWD(x) x -#endif - @ cdecl ScsiDebugPrint() @ stdcall ScsiPortCompleteRequest(ptr long long long long) @ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) -@ stdcall ScsiPortConvertUlongToPhysicalAddress(long) MAYBEFWD(NTOSKRNL.RtlConvertUlongToLargeInteger) +@ stdcall -arch=i386 ScsiPortConvertUlongToPhysicalAddress(long) NTOSKRNL.RtlConvertUlongToLargeInteger +@ stdcall -arch=x86_64 ScsiPortConvertUlongToPhysicalAddress(long) @ stdcall ScsiPortFlushDma(ptr) @ stdcall ScsiPortFreeDeviceBase(ptr ptr) @ stdcall ScsiPortGetBusData(ptr long long long ptr long) @@ -22,30 +17,54 @@ @ stdcall ScsiPortLogError(ptr ptr long long long long long) @ stdcall ScsiPortMoveMemory(ptr ptr long) @ cdecl ScsiPortNotification() -@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_UCHAR) -@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_USHORT) -@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_ULONG) -@ stdcall ScsiPortReadPortUchar(ptr) MAYBEFWD(HAL.READ_PORT_UCHAR) -@ stdcall ScsiPortReadPortUshort(ptr) MAYBEFWD(HAL.READ_PORT_USHORT) -@ stdcall ScsiPortReadPortUlong(ptr) MAYBEFWD(HAL.READ_PORT_ULONG) -@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_UCHAR) -@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_USHORT) -@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_ULONG) -@ stdcall ScsiPortReadRegisterUchar(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_UCHAR) -@ stdcall ScsiPortReadRegisterUshort(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_USHORT) -@ stdcall ScsiPortReadRegisterUlong(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_ULONG) +@ stdcall -arch=i386 ScsiPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR +@ stdcall -arch=i386 ScsiPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT +@ stdcall -arch=i386 ScsiPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG +@ stdcall -arch=i386 ScsiPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR +@ stdcall -arch=i386 ScsiPortReadPortUshort(ptr) HAL.READ_PORT_USHORT +@ stdcall -arch=i386 ScsiPortReadPortUlong(ptr) HAL.READ_PORT_ULONG +@ stdcall -arch=i386 ScsiPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR +@ stdcall -arch=i386 ScsiPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT +@ stdcall -arch=i386 ScsiPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG +@ stdcall -arch=i386 ScsiPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR +@ stdcall -arch=i386 ScsiPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT +@ stdcall -arch=i386 ScsiPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG +@ stdcall -arch=x86_64 ScsiPortReadPortBufferUchar(ptr ptr long) +@ stdcall -arch=x86_64 ScsiPortReadPortBufferUshort(ptr ptr long) +@ stdcall -arch=x86_64 ScsiPortReadPortBufferUlong(ptr ptr long) +@ stdcall -arch=x86_64 ScsiPortReadPortUchar(ptr) +@ stdcall -arch=x86_64 ScsiPortReadPortUshort(ptr) +@ stdcall -arch=x86_64 ScsiPortReadPortUlong(ptr) +@ stdcall -arch=x86_64 ScsiPortReadRegisterBufferUchar(ptr ptr long) +@ stdcall -arch=x86_64 ScsiPortReadRegisterBufferUshort(ptr ptr long) +@ stdcall -arch=x86_64 ScsiPortReadRegisterBufferUlong(ptr ptr long) +@ stdcall -arch=x86_64 ScsiPortReadRegisterUchar(ptr) +@ stdcall -arch=x86_64 ScsiPortReadRegisterUshort(ptr) +@ stdcall -arch=x86_64 ScsiPortReadRegisterUlong(ptr) @ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long) @ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor @ stdcall ScsiPortValidateRange(ptr long long long long long long) -@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_UCHAR) -@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_USHORT) -@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_ULONG) -@ stdcall ScsiPortWritePortUchar(ptr long) MAYBEFWD(HAL.WRITE_PORT_UCHAR) -@ stdcall ScsiPortWritePortUshort(ptr long) MAYBEFWD(HAL.WRITE_PORT_USHORT) -@ stdcall ScsiPortWritePortUlong(ptr long) MAYBEFWD(HAL.WRITE_PORT_ULONG) -@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR) -@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT) -@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG) -@ stdcall ScsiPortWriteRegisterUchar(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_UCHAR) -@ stdcall ScsiPortWriteRegisterUshort(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_USHORT) -@ stdcall ScsiPortWriteRegisterUlong(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_ULONG) +@ stdcall -arch=i386 ScsiPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR +@ stdcall -arch=i386 ScsiPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT +@ stdcall -arch=i386 ScsiPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG +@ stdcall -arch=i386 ScsiPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR +@ stdcall -arch=i386 ScsiPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT +@ stdcall -arch=i386 ScsiPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG +@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR +@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT +@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG +@ stdcall -arch=i386 ScsiPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR +@ stdcall -arch=i386 ScsiPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT +@ stdcall -arch=i386 ScsiPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG +@ stdcall -arch=x86_64 ScsiPortWritePortBufferUchar(ptr ptr long) +@ stdcall -arch=x86_64 ScsiPortWritePortBufferUshort(ptr ptr long) +@ stdcall -arch=x86_64 ScsiPortWritePortBufferUlong(ptr ptr long) +@ stdcall -arch=x86_64 ScsiPortWritePortUchar(ptr long) +@ stdcall -arch=x86_64 ScsiPortWritePortUshort(ptr long) +@ stdcall -arch=x86_64 ScsiPortWritePortUlong(ptr long) +@ stdcall -arch=x86_64 ScsiPortWriteRegisterBufferUchar(ptr ptr long) +@ stdcall -arch=x86_64 ScsiPortWriteRegisterBufferUshort(ptr ptr long) +@ stdcall -arch=x86_64 ScsiPortWriteRegisterBufferUlong(ptr ptr long) +@ stdcall -arch=x86_64 ScsiPortWriteRegisterUchar(ptr long) +@ stdcall -arch=x86_64 ScsiPortWriteRegisterUshort(ptr long) +@ stdcall -arch=x86_64 ScsiPortWriteRegisterUlong(ptr long)

1 0

[tkreuzer] 49688: [MSVCRT] Add 25 exports with proper entries instead of stub
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 13:46:56 2010 New Revision: 49688 URL: http://svn.reactos.org/svn/reactos?rev=49688&view=rev Log: [MSVCRT] Add 25 exports with proper entries instead of stub Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sun Nov 21 13:46:56 2010 @@ -198,7 +198,7 @@ @ cdecl -arch=i386 __p__osver() @ cdecl -arch=i386 __p__pctype() __pctype_func @ cdecl -arch=i386 __p__pgmptr() -@ stub -arch=i386 __p__pwctype #() +@ cdecl -arch=i386 __p__pwctype() @ cdecl -arch=i386 __p__timezone() __p__timezone @ cdecl -arch=i386 __p__tzname() @ cdecl -arch=i386 __p__wcmdln() @@ -210,7 +210,7 @@ @ cdecl __pctype_func() __pctype_func @ extern __pioinfo __pioinfo # stub __pwctype_func -@ stub __pxcptinfoptrs #() +@ cdecl __pxcptinfoptrs() @ cdecl __set_app_type(long) @ extern __setlc_active @ cdecl __setusermatherr(ptr) @@ -381,7 +381,7 @@ @ cdecl _flushall() @ extern _fmode @ cdecl _fpclass(double) -@ stub _fpieee_flt #(long ptr ptr) +@ cdecl _fpieee_flt(long ptr ptr) @ cdecl _fpreset() # stub _fprintf_l # stub _fprintf_p @@ -452,7 +452,7 @@ @ cdecl _getmaxstdio() @ cdecl _getmbcp() @ cdecl _getpid() kernel32.GetCurrentProcessId -@ stub _getsystime #(ptr) +@ cdecl _getsystime(ptr) @ cdecl _getw(ptr) # stub _getwch # stub _getwche @@ -490,13 +490,13 @@ # stub _isgraph_l # stub _isleadbyte_l # stub _islower_l -@ stub _ismbbalnum #(long) +@ cdecl _ismbbalnum(long) # stub _ismbbalnum_l @ stub _ismbbalpha #(long) # stub _ismbbalpha_l -@ stub _ismbbgraph #(long) +@ cdecl _ismbbgraph(long) # stub _ismbbgraph_l -@ stub _ismbbkalnum #(long) +@ cdecl _ismbbkalnum(long) # stub _ismbbkalnum_l @ cdecl _ismbbkana(long) # stub _ismbbkana_l @@ -508,7 +508,7 @@ # stub _ismbblead_l @ stub _ismbbprint #(long) # stub _ismbbprint_l -@ stub _ismbbpunct #(long) +@ cdecl _ismbbpunct(long) # stub _ismbbpunct_l @ cdecl _ismbbtrail(long) # stub _ismbbtrail_l @@ -524,11 +524,11 @@ # stub _ismbchira_l @ cdecl _ismbckata(long) # stub _ismbckata_l -@ stub _ismbcl0 #(long) +@ cdecl _ismbcl0(long) # stub _ismbcl0_l -@ stub _ismbcl1 #(long) +@ cdecl _ismbcl1(long) # stub _ismbcl1_l -@ stub _ismbcl2 #(long) +@ cdecl _ismbcl2(long) # stub _ismbcl2_l @ cdecl _ismbclegal(long) # stub _ismbclegal_l @@ -609,13 +609,13 @@ # stub _mbccpy_s_l @ cdecl _mbcjistojms (long) # stub _mbcjistojms_l -@ stub _mbcjmstojis #(long) +@ cdecl _mbcjmstojis(long) # stub _mbcjmstojis_l @ cdecl _mbclen(ptr) # stub _mbclen_l -@ stub _mbctohira #(long) +@ cdecl _mbctohira(long) # stub _mbctohira_l -@ stub _mbctokata #(long) +@ cdecl _mbctokata(long) # stub _mbctokata_l @ cdecl _mbctolower(long) # stub _mbctolower_l @@ -665,7 +665,7 @@ # stub _mbsnbcmp_l @ cdecl _mbsnbcnt(ptr long) # stub _mbsnbcnt_l -@ stub _mbsnbcoll #(str str long) +@ cdecl _mbsnbcoll(str str long) # stub _mbsnbcoll_l @ cdecl _mbsnbcpy(ptr str long) # stub _mbsnbcpy_l @@ -673,7 +673,7 @@ # stub _mbsnbcpy_s_l @ cdecl _mbsnbicmp(str str long) # stub _mbsnbicmp_l -@ stub _mbsnbicoll #(str str long) +@ cdecl _mbsnbicoll(str str long) # stub _mbsnbicoll_l @ cdecl _mbsnbset(str long long) # stub _mbsnbset_l @@ -687,7 +687,7 @@ # stub _mbsnccnt_l @ cdecl _mbsncmp(str str long) # stub _mbsncmp_l -@ stub _mbsncoll #(str str long) +@ cdecl _mbsncoll(str str long) # stub _mbsncoll_l @ cdecl _mbsncpy(str str long) # stub _mbsncpy_l @@ -697,7 +697,7 @@ # stub _mbsnextc_l @ cdecl _mbsnicmp(str str long) # stub _mbsnicmp_l -@ stub _mbsnicoll #(str str long) +@ cdecl _mbsnicoll(str str long) # stub _mbsnicoll_l @ cdecl _mbsninc(str long) # stub _mbsninc_l @@ -819,7 +819,7 @@ @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) -@ stub _setsystime #(ptr long) +@ cdecl _setsystime(ptr long) @ cdecl _sleep(long) @ varargs _snprintf(ptr long str) # stub _snprintf_c @@ -876,11 +876,11 @@ # stub _strlwr_l # stub _strlwr_s # stub _strlwr_s_l -@ stub _strncoll #(str str long) +@ cdecl _strncoll(str str long) # stub _strncoll_l @ cdecl _strnicmp(str str long) # stub _strnicmp_l -@ stub _strnicoll #(str str long) +@ cdecl _strnicoll(str str long) # stub _strnicoll_l @ cdecl _strnset(str long long) # stub _strnset_s @@ -1021,11 +1021,11 @@ # stub _wcslwr_l # stub _wcslwr_s # stub _wcslwr_s_l -@ stub _wcsncoll #(wstr wstr long) +@ cdecl _wcsncoll(wstr wstr long) # stub _wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) # stub _wcsnicmp_l -@ stub _wcsnicoll #(wstr wstr long) +@ cdecl _wcsnicoll(wstr wstr long) # stub _wcsnicoll_l @ cdecl _wcsnset(wstr long long) # stub _wcsnset_s @@ -1131,7 +1131,7 @@ @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) # stub _wtempnam_dbg -@ stub _wtmpnam #(ptr) +@ cdecl _wtmpnam(ptr) # stub _wtmpnam_s # @ cdecl _wtof(wstr) # @ cdecl _wtof_l(wstr ptr) @@ -1398,7 +1398,7 @@ @ cdecl wcstombs(ptr ptr long) # @ cdecl wcstombs_s(ptr ptr long wstr long) @ cdecl wcstoul(wstr ptr long) -@ stub wcsxfrm #(ptr wstr long) +@ cdecl wcsxfrm(ptr wstr long) # stub wctob @ cdecl wctomb(ptr long) # stub wctomb_s

1 0

[tkreuzer] 49687: [SPEC2DEF] - Handle -i386 - Improve debug output
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 13:45:17 2010 New Revision: 49687 URL: http://svn.reactos.org/svn/reactos?rev=49687&view=rev Log: [SPEC2DEF] - Handle -i386 - Improve debug output Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Sun Nov 21 13:45:17 2010 @@ -294,7 +294,12 @@ while (*pc > ',') pc++; } } + else if (CompareToken(pc, "-i386")) + { + if (_stricmp(pszArchString, "i386") != 0) included = 0; + } else if (CompareToken(pc, "-noname") || + CompareToken(pc, "-norelay") || CompareToken(pc, "-ret64") || CompareToken(pc, "-private")) { @@ -302,7 +307,8 @@ } else { - fprintf(stderr, "info: ignored option: '%.10s'\n", pc); + fprintf(stderr, "info: ignored option: '%.*s'\n", + TokenLength(pc), pc); } /* Go to next token */

1 0

[tkreuzer] 49686: [MSVCRT] - Make stubs raise an exception like winestubs - Remove ugly wine-stubs
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 13:35:43 2010 New Revision: 49686 URL: http://svn.reactos.org/svn/reactos?rev=49686&view=rev Log: [MSVCRT] - Make stubs raise an exception like winestubs - Remove ugly wine-stubs Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] Sun Nov 21 13:35:43 2010 @@ -5,8 +5,16 @@ #include "wine/config.h" #include "wine/exception.h" -#define NDEBUG -#include <debug.h> +void __wine_spec_unimplemented_stub( const char *module, const char *function ) +{ + ULONG_PTR args[2]; + + args[0] = (ULONG_PTR)module; + args[1] = (ULONG_PTR)function; + RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); +} + +#define UNIMPLEMENTED __wine_spec_unimplemented_stub("msvcrt.dll", __FUNCTION__) int __get_app_type() { @@ -89,48 +97,3 @@ UNIMPLEMENTED; return 0; } - -void __wine_spec_unimplemented_stub( const char *module, const char *function ) -{ - ULONG_PTR args[2]; - - args[0] = (ULONG_PTR)module; - args[1] = (ULONG_PTR)function; - RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); -} - -static const char __wine_spec_file_name[] = "msvcrt.dll"; - -void __wine_stub_msvcrt_dll_115(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__lc_collate"); } -void __wine_stub_msvcrt_dll_140(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__p__pwctype"); } -void __wine_stub_msvcrt_dll_151(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__pxcptinfoptrs"); } -void __wine_stub_msvcrt_dll_267(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_fpieee_flt"); } -void __wine_stub_msvcrt_dll_288(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_get_terminate"); } -void __wine_stub_msvcrt_dll_289(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_get_unexpected"); } -void __wine_stub_msvcrt_dll_301(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_getsystime"); } -void __wine_stub_msvcrt_dll_311(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_heapused"); } -void __wine_stub_msvcrt_dll_323(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbalnum"); } -void __wine_stub_msvcrt_dll_324(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbalpha"); } -void __wine_stub_msvcrt_dll_325(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbgraph"); } -void __wine_stub_msvcrt_dll_326(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbkalnum"); } -void __wine_stub_msvcrt_dll_329(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbkpunct"); } -void __wine_stub_msvcrt_dll_331(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbprint"); } -void __wine_stub_msvcrt_dll_332(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbpunct"); } -void __wine_stub_msvcrt_dll_340(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbcl0"); } -void __wine_stub_msvcrt_dll_341(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbcl1"); } -void __wine_stub_msvcrt_dll_342(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbcl2"); } -void __wine_stub_msvcrt_dll_380(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbcjmstojis"); } -void __wine_stub_msvcrt_dll_382(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbctohira"); } -void __wine_stub_msvcrt_dll_383(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbctokata"); } -void __wine_stub_msvcrt_dll_405(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsnbcoll"); } -void __wine_stub_msvcrt_dll_409(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsnbicoll"); } -void __wine_stub_msvcrt_dll_414(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsncoll"); } -void __wine_stub_msvcrt_dll_418(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsnicoll"); } -void __wine_stub_msvcrt_dll_480(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_setsystime"); } -void __wine_stub_msvcrt_dll_505(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_strncoll"); } -void __wine_stub_msvcrt_dll_507(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_strnicoll"); } -void __wine_stub_msvcrt_dll_556(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_wcsncoll"); } -void __wine_stub_msvcrt_dll_558(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_wcsnicoll"); } -void __wine_stub_msvcrt_dll_598(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_wperror"); } -void __wine_stub_msvcrt_dll_625(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_wtmpnam"); } -void __wine_stub_msvcrt_dll_832(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "wcsxfrm"); }

1 0

[tkreuzer] 49685: [MSDMO] add proper stubs
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 13:21:05 2010 New Revision: 49685 URL: http://svn.reactos.org/svn/reactos?rev=49685&view=rev Log: [MSDMO] add proper stubs Added: branches/cmake-bringup/dll/directx/msdmo/stubs.c (with props) Modified: branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt branches/cmake-bringup/dll/directx/msdmo/msdmo.spec Modified: branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/msdmo… ============================================================================== --- branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] Sun Nov 21 13:21:05 2010 @@ -9,6 +9,7 @@ add_library(msdmo SHARED dmoreg.c dmort.c + stubs.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def) @@ -27,4 +28,4 @@ add_dependencies(msdmo dxsdk psdk buildno_header) -add_cab_target(msdmo 1) +add_cab_target(msdmo 1) Modified: branches/cmake-bringup/dll/directx/msdmo/msdmo.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/msdmo… ============================================================================== --- branches/cmake-bringup/dll/directx/msdmo/msdmo.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/msdmo/msdmo.spec [iso-8859-1] Sun Nov 21 13:21:05 2010 @@ -1,11 +1,11 @@ @ stdcall DMOEnum(ptr long long ptr long ptr ptr) @ stdcall DMOGetName(ptr wstr) @ stdcall DMOGetTypes(ptr long ptr ptr long ptr ptr) -@ stub DMOGuidToStrA -@ stub DMOGuidToStrW +@ stdcall DMOGuidToStrA(long long) +@ stdcall DMOGuidToStrW(long long) @ stdcall DMORegister(wstr ptr ptr long long ptr long ptr) -@ stub DMOStrToGuidA -@ stub DMOStrToGuidW +@ stdcall DMOStrToGuidA(long long) +@ stdcall DMOStrToGuidW(long long) @ stdcall DMOUnregister(ptr ptr) @ stdcall MoCopyMediaType(ptr ptr) @ stdcall MoCreateMediaType(ptr long) Added: branches/cmake-bringup/dll/directx/msdmo/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/msdmo… ============================================================================== --- branches/cmake-bringup/dll/directx/msdmo/stubs.c (added) +++ branches/cmake-bringup/dll/directx/msdmo/stubs.c [iso-8859-1] Sun Nov 21 13:21:05 2010 @@ -1,0 +1,32 @@ + +#include <windows.h> +#define NDEBUG +#include <debug.h> + +void +WINAPI +DMOGuidToStrA(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void +WINAPI +DMOGuidToStrW(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void +WINAPI +DMOStrToGuidA(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void +WINAPI +DMOStrToGuidW(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} Propchange: branches/cmake-bringup/dll/directx/msdmo/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 49684: [MSVCRT] - Add a number of stub functions to fix build - Comment out some exports that are probably 2k/nt4 only - don't set -u flag for MSVC
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 13:08:55 2010 New Revision: 49684 URL: http://svn.reactos.org/svn/reactos?rev=49684&view=rev Log: [MSVCRT] - Add a number of stub functions to fix build - Comment out some exports that are probably 2k/nt4 only - don't set -u flag for MSVC Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Sun Nov 21 13:08:55 2010 @@ -23,7 +23,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/msvcrt_precomp.h.gch ${SOURCE}) +if (NOT MSVC) set_target_properties(msvcrt PROPERTIES LINK_FLAGS "-u __seh_longjmp_unwind@4") +endif() set_module_type(msvcrt win32dll) target_link_libraries(msvcrt Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sun Nov 21 13:08:55 2010 @@ -144,7 +144,7 @@ @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() __doserrno @ cdecl __fpecode() -@ stub __get_app_type +@ cdecl __get_app_type() @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv __initenv @ cdecl __iob_func() __p__iob @@ -152,7 +152,7 @@ @ cdecl __iscsym(long) __iscsym @ cdecl __iscsymf(long) __iscsymf @ extern __lc_codepage MSVCRT___lc_codepage -@ stub __lc_collate +# @ stub __lc_collate # not in XP / 7 @ extern __lc_collate_cp MSVCRT___lc_collate_cp @ extern __lc_handle MSVCRT___lc_handle @ cdecl __lconv_init() @@ -190,10 +190,10 @@ @ cdecl -arch=i386 __p__daylight() @ cdecl -arch=i386 __p__dstbias() @ cdecl -arch=i386 __p__environ() -@ stub -arch=i386 __p__fileinfo #() +@ cdecl -arch=i386 __p__fileinfo() @ cdecl -arch=i386 __p__fmode() @ cdecl -arch=i386 __p__iob() -@ stub -arch=i386 __p__mbcasemap #() +@ cdecl -arch=i386 __p__mbcasemap() @ cdecl -arch=i386 __p__mbctype() @ cdecl -arch=i386 __p__osver() @ cdecl -arch=i386 __p__pctype() __pctype_func @@ -260,7 +260,7 @@ # stub _aligned_realloc_dbg @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) -@ stub _atodbl #(ptr str) +@ cdecl _atodbl(ptr str) # stub _atodbl_l # @ cdecl _atof_l(str ptr) # stub _atoflt_l @@ -365,7 +365,7 @@ @ cdecl _fgetchar() @ cdecl _fgetwchar() @ cdecl _filbuf(ptr) -# extern _fileinfo +@ extern _fileinfo @ cdecl _filelength(long) @ cdecl -ret64 _filelengthi64(long) @ cdecl _fileno(ptr) @@ -439,8 +439,8 @@ # stub _get_winminor # stub _get_winver # stub _get_wpgmptr -@ stub _get_terminate -@ stub _get_unexpected +# @ stub _get_terminate # not in XP / 7 +# @ stub _get_unexpected # not in XP / 7 @ cdecl _getch() @ cdecl _getche() @ cdecl _getcwd(str long) @@ -466,7 +466,7 @@ @ cdecl _heapchk() @ cdecl _heapmin() @ cdecl _heapset(long) -@ stub _heapused #(ptr ptr) +# @ stub _heapused #(ptr ptr) # not in XP / 7 @ cdecl _heapwalk(ptr) @ cdecl _hypot(double double) @ cdecl _i64toa(long long ptr long) @@ -475,10 +475,10 @@ # stub _i64tow_s @ cdecl _initterm(ptr ptr) # stub _initterm_e -@ stub _inp #(long) -i386 -@ stub _inpd #(long) -i386 -@ stub _inpw #(long) -i386 -# @ cdecl _invalid_parameter(wstr wstr wstr long long) +@ cdecl -arch=i386 _inp(long) +@ cdecl -arch=i386 _inpd(long) +@ cdecl -arch=i386 _inpw(long) +@ cdecl _invalid_parameter(wstr wstr wstr long long) @ extern _iob # stub _isalnum_l # stub _isalpha_l @@ -500,9 +500,9 @@ # stub _ismbbkalnum_l @ cdecl _ismbbkana(long) # stub _ismbbkana_l -@ stub _ismbbkprint #(long) +@ cdecl _ismbbkprint(long) # stub _ismbbkprint_l -@ stub _ismbbkpunct #(long) +@ cdecl _ismbbkpunct(long) # stub _ismbbkpunct_l @ cdecl _ismbblead(long) # stub _ismbblead_l @@ -602,7 +602,7 @@ @ cdecl _mbbtombc(long) # stub _mbbtombc_l @ cdecl _mbbtype(long long) -# extern _mbcasemap +@ extern _mbcasemap @ cdecl _mbccpy (str str) # stub _mbccpy_l # stub _mbccpy_s @@ -757,9 +757,9 @@ @ cdecl _open_osfhandle(long long) @ extern _osplatform _osplatform @ extern _osver _osver -@ stub _outp #(long long) -@ stub _outpd #(long long) -@ stub _outpw #(long long) +@ cdecl _outp(long long) +@ cdecl _outpd(long long) +@ cdecl _outpw(long long) @ cdecl _pclose (ptr) @ extern _pctype _pctype @ extern _pgmptr _pgmptr @@ -1091,7 +1091,7 @@ # stub _wmktemp_s @ varargs _wopen(wstr long) # stub _woutput_s -@ stub _wperror #(wstr) +@ cdecl _wperror(wstr) @ extern _wpgmptr @ cdecl _wpopen (wstr wstr) # stub _wprintf_l Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] Sun Nov 21 13:08:55 2010 @@ -4,6 +4,91 @@ #include "winbase.h" #include "wine/config.h" #include "wine/exception.h" + +#define NDEBUG +#include <debug.h> + +int __get_app_type() +{ + UNIMPLEMENTED; + return 0; +} + +int _fileinfo; + +void * +__p__fileinfo() +{ + return &_fileinfo; +} + +unsigned char _mbcasemap[1]; + +void * +__p__mbcasemap() +{ + return _mbcasemap; +} + +int _atodbl( + void * value, + char * str) +{ + UNIMPLEMENTED; + return 0; +} + +int _ismbbkprint( + unsigned int c) +{ + UNIMPLEMENTED; + return 0; +} + +int _inp( + unsigned short port) +{ + UNIMPLEMENTED; + return 0; +} + +unsigned short _inpw( + unsigned short port) +{ + UNIMPLEMENTED; + return 0; +} + +unsigned long _inpd( + unsigned short port) +{ + return 0; +} + + +int _outp( + unsigned short port, + int databyte) +{ + UNIMPLEMENTED; + return 0; +} + +unsigned short _outpw( + unsigned short port, + unsigned short dataword) +{ + UNIMPLEMENTED; + return 0; +} + +unsigned long _outpd( + unsigned short port, + unsigned long dataword) +{ + UNIMPLEMENTED; + return 0; +} void __wine_spec_unimplemented_stub( const char *module, const char *function ) { @@ -16,26 +101,18 @@ static const char __wine_spec_file_name[] = "msvcrt.dll"; -void __wine_stub_msvcrt_dll_107(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__get_app_type"); } void __wine_stub_msvcrt_dll_115(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__lc_collate"); } -void __wine_stub_msvcrt_dll_132(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__p__fileinfo"); } -void __wine_stub_msvcrt_dll_135(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__p__mbcasemap"); } void __wine_stub_msvcrt_dll_140(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__p__pwctype"); } void __wine_stub_msvcrt_dll_151(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "__pxcptinfoptrs"); } -void __wine_stub_msvcrt_dll_189(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_atodbl"); } void __wine_stub_msvcrt_dll_267(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_fpieee_flt"); } void __wine_stub_msvcrt_dll_288(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_get_terminate"); } void __wine_stub_msvcrt_dll_289(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_get_unexpected"); } void __wine_stub_msvcrt_dll_301(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_getsystime"); } void __wine_stub_msvcrt_dll_311(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_heapused"); } -void __wine_stub_msvcrt_dll_317(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_inp"); } -void __wine_stub_msvcrt_dll_318(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_inpd"); } -void __wine_stub_msvcrt_dll_319(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_inpw"); } void __wine_stub_msvcrt_dll_323(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbalnum"); } void __wine_stub_msvcrt_dll_324(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbalpha"); } void __wine_stub_msvcrt_dll_325(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbgraph"); } void __wine_stub_msvcrt_dll_326(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbkalnum"); } -void __wine_stub_msvcrt_dll_328(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbkprint"); } void __wine_stub_msvcrt_dll_329(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbkpunct"); } void __wine_stub_msvcrt_dll_331(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbprint"); } void __wine_stub_msvcrt_dll_332(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_ismbbpunct"); } @@ -49,9 +126,6 @@ void __wine_stub_msvcrt_dll_409(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsnbicoll"); } void __wine_stub_msvcrt_dll_414(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsncoll"); } void __wine_stub_msvcrt_dll_418(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_mbsnicoll"); } -void __wine_stub_msvcrt_dll_447(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_outp"); } -void __wine_stub_msvcrt_dll_448(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_outpd"); } -void __wine_stub_msvcrt_dll_449(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_outpw"); } void __wine_stub_msvcrt_dll_480(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_setsystime"); } void __wine_stub_msvcrt_dll_505(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_strncoll"); } void __wine_stub_msvcrt_dll_507(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_strnicoll"); }

1 0

[tkreuzer] 49683: [CMAKE] - Add /nologo, when preprocessing asm files - Move add_pch to compiler specific files (maybe someone can fix it for MSVC) - Update set_module_type for MSVC
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 12:32:03 2010 New Revision: 49683 URL: http://svn.reactos.org/svn/reactos?rev=49683&view=rev Log: [CMAKE] - Add /nologo, when preprocessing asm files - Move add_pch to compiler specific files (maybe someone can fix it for MSVC) - Update set_module_type for MSVC Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake branches/cmake-bringup/toolchain-msvc.cmake 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] Sun Nov 21 12:32:03 2010 @@ -26,20 +26,6 @@ endif() ENDMACRO(_PCH_GET_COMPILE_FLAGS) - -MACRO(add_pch _target_name _header_filename _src_list) - - get_filename_component(FILE ${_header_filename} NAME) - set(_gch_filename "${_target_name}_${FILE}.gch") - list(APPEND ${_src_list} ${_gch_filename}) - _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename}) - file(REMOVE ${_gch_filename}) - add_custom_command( - OUTPUT ${_gch_filename} - COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args} - DEPENDS ${_header_filename}) - -ENDMACRO(add_pch _target_name _header_filename _src_list) if (NOT MSVC) MACRO(CreateBootSectorTarget _target_name _asm_file _object_file) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=496… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Nov 21 12:32:03 2010 @@ -33,6 +33,18 @@ add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) # Macros +MACRO(add_pch _target_name _header_filename _src_list) + get_filename_component(FILE ${_header_filename} NAME) + set(_gch_filename "${_target_name}_${FILE}.gch") + list(APPEND ${_src_list} ${_gch_filename}) + _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename}) + file(REMOVE ${_gch_filename}) + add_custom_command( + OUTPUT ${_gch_filename} + COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args} + DEPENDS ${_header_filename}) +ENDMACRO(add_pch _target_name _header_filename _src_list) + macro(add_linkerflag MODULE _flag) set(NEW_LINKER_FLAGS ${_flag}) get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=496… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sun Nov 21 12:32:03 2010 @@ -23,6 +23,18 @@ set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") +MACRO(add_pch _target_name _header_filename _src_list) + get_filename_component(FILE ${_header_filename} NAME) + set(_gch_filename "${_target_name}_${FILE}.gch") + list(APPEND ${_src_list} ${_gch_filename}) + _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename}) + file(REMOVE ${_gch_filename}) + add_custom_command( + OUTPUT ${_gch_filename} + COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args} + DEPENDS ${_header_filename}) +ENDMACRO(add_pch _target_name _header_filename _src_list) + macro(add_linkerflag MODULE _flag) set(NEW_LINKER_FLAGS ${_flag}) get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) @@ -52,17 +64,27 @@ add_dependencies(${MODULE} psdk buildno_header) if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) - add_importlibs(${MODULE} ntdll) + set_entrypoint(${MODULE} NtProcessStartup@4) endif() if (${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) set_entrypoint(${MODULE} WinMainCRTStartup) - target_link_libraries(${MODULE} mingw_common mingw_wmain) + if(IS_UNICODE) + target_link_libraries(${MODULE} mingw_wmain) + else() + target_link_libraries(${MODULE} mingw_main) + endif() + target_link_libraries(${MODULE} mingw_common) endif () if (${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) set_entrypoint(${MODULE} mainCRTStartup) - target_link_libraries(${MODULE} mingw_common mingw_wmain) + if(IS_UNICODE) + target_link_libraries(${MODULE} mingw_wmain) + else() + target_link_libraries(${MODULE} mingw_main) + endif() + target_link_libraries(${MODULE} mingw_common) endif () if(${TYPE} MATCHES win32dll) # Need this only because mingw library is broken @@ -75,6 +97,14 @@ target_link_libraries(${MODULE} mingw_common mingw_dllmain) add_linkerflag(${MODULE} "/DLL") endif() + if(${TYPE} MATCHES win32ocx) + set_entrypoint(${MODULE} DllMain@12) + set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") + endif() + if(${TYPE} MATCHES cpl) + set_entrypoint(${MODULE} DllMain@12) + set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") + endif() if(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") set_entrypoint(${MODULE} DriverEntry@8) @@ -86,7 +116,8 @@ endmacro() macro(set_unicode) - add_definitions(-DUNICODE -D_UNICODE) + add_definitions(-DUNICODE -D_UNICODE) + set(IS_UNICODE 1) endmacro() set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") 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] Sun Nov 21 12:32:03 2010 @@ -35,7 +35,7 @@ SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> /win32 /Dstrict_context_handle= /h <OBJECT> <SOURCE>") SET(CMAKE_ASM_COMPILE_OBJECT - "<CMAKE_C_COMPILER> /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" + "<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" "<CMAKE_ASM_COMPILER> /nologo /Fo<OBJECT> /c /Ta <OBJECT>.tmp") set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000")

1 0

[tkreuzer] 49682: [MINGW] Remove alloca_probe_16 stub
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 12:29:35 2010 New Revision: 49682 URL: http://svn.reactos.org/svn/reactos?rev=49682&view=rev Log: [MINGW] Remove alloca_probe_16 stub Modified: branches/cmake-bringup/lib/3rdparty/mingw/mscmain.c Modified: branches/cmake-bringup/lib/3rdparty/mingw/mscmain.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/mscmain.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/mscmain.c [iso-8859-1] Sun Nov 21 12:29:35 2010 @@ -8,12 +8,6 @@ #include <stdlib.h> int _fltused; - -void -_cdecl -_alloca_probe_16(void) -{ -} void __do_global_dtors (void)

1 0

[tkreuzer] 49681: [HAL] Convert asm to new syntax, use spec file
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 10:10:38 2010 New Revision: 49681 URL: http://svn.reactos.org/svn/reactos?rev=49681&view=rev Log: [HAL] Convert asm to new syntax, use spec file Modified: branches/cmake-bringup/hal/CMakeLists.txt branches/cmake-bringup/hal/halx86/amd64/mps.S branches/cmake-bringup/hal/halx86/amd64/systimer.S branches/cmake-bringup/hal/halx86/generic/bios.c branches/cmake-bringup/hal/halx86/generic/i386/systimer.S branches/cmake-bringup/hal/halx86/generic/i386/trap.S branches/cmake-bringup/hal/halx86/mp/i386/mps.S Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -1,3 +1,5 @@ + +spec2def(hal.dll hal.spec) if(ARCH MATCHES i386) @@ -51,7 +53,8 @@ ${HAL_GENERIC_PCAT_SOURCE} ${HAL_GENERIC_UP_SOURCE} halx86/up/halinit_up.c - halx86/up/halup.rc) + halx86/up/halup.rc + ${CMAKE_CURRENT_BINARY_DIR}/hal.def) add_library(hal SHARED ${HAL_SOURCE}) add_pch(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_SOURCE}) @@ -63,9 +66,7 @@ add_importlibs(hal ntoskrnl) -target_link_libraries(hal - ${CMAKE_CURRENT_SOURCE_DIR}/halx86/hal_i386.def - libcntpr) +target_link_libraries(hal libcntpr) list(APPEND MINI_HAL_SOURCE halx86/generic/legacy/bus/bushndlr.c @@ -106,4 +107,4 @@ #TBD endif(ARCH MATCHES i386) -add_importlib_target(hal.spec) +add_importlib_target(hal.spec) Modified: branches/cmake-bringup/hal/halx86/amd64/mps.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/amd64/… ============================================================================== --- branches/cmake-bringup/hal/halx86/amd64/mps.S [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/amd64/mps.S [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -8,8 +8,9 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> + +#include <ksamd64.inc> /* FUNCTIONS *****************************************************************/ @@ -92,5 +93,5 @@ AFTER iret - +END /* EOF */ Modified: branches/cmake-bringup/hal/halx86/amd64/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/amd64/… ============================================================================== --- branches/cmake-bringup/hal/halx86/amd64/systimer.S [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/amd64/systimer.S [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -7,8 +7,9 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> + +#include <ksamd64.inc> /* GLOBALS *******************************************************************/ @@ -90,3 +91,4 @@ UNIMPLEMENTED _HalpClockInterrupt iret +END Modified: branches/cmake-bringup/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/generi… ============================================================================== --- branches/cmake-bringup/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/generic/bios.c [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -197,9 +197,9 @@ /* V86 TRAP HANDLERS **********************************************************/ #ifndef _MINIHAL_ +DECLSPEC_NORETURN VOID FASTCALL -DECLSPEC_NORETURN HalpTrap0DHandler(IN PKTRAP_FRAME TrapFrame) { /* Enter the trap */ Modified: branches/cmake-bringup/hal/halx86/generic/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/generi… ============================================================================== --- branches/cmake-bringup/hal/halx86/generic/i386/systimer.S [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/generic/i386/systimer.S [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -7,8 +7,9 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/asm.h> +#include <asm.inc> + +#include <ks386.inc> EXTERN _HalpAcquireSystemHardwareSpinLock@0:PROC EXTERN _HalpReleaseCmosSpinLock@0:PROC @@ -39,7 +40,7 @@ /* GLOBALS *******************************************************************/ .data -//ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING +ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING PUBLIC _HalpPerfCounter _HalpLastPerfCounterLow: .long 0 Modified: branches/cmake-bringup/hal/halx86/generic/i386/trap.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/generi… ============================================================================== --- branches/cmake-bringup/hal/halx86/generic/i386/trap.S [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/generic/i386/trap.S [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -8,12 +8,12 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/i386/asm.h> +#include <asm.inc> + +#include <ks386.inc> #include <internal/i386/asmmacro.S> -.code32 -.text +.code TRAP_ENTRY HalpTrap0D, 0 TRAP_ENTRY HalpApcInterrupt, KI_SOFTWARE_TRAP @@ -42,4 +42,6 @@ .space 2048 _HalpRealModeEnd: PUBLIC _HalpRealModeEnd +.endcode16 +END Modified: branches/cmake-bringup/hal/halx86/mp/i386/mps.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/mp/i38… ============================================================================== --- branches/cmake-bringup/hal/halx86/mp/i386/mps.S [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/mp/i386/mps.S [iso-8859-1] Sun Nov 21 10:10:38 2010 @@ -11,7 +11,9 @@ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> +#include <asm.inc> + +#include <ks386.inc> /* FUNCTIONS *****************************************************************/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs