Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[cgutman] 38144: - Don't redo things that have already been done in AddGenericHeaderIPv4

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Dec 17 06:14:26 2008 New Revision: 38144 URL: http://svn.reactos.org/svn/reactos?rev=38144&view=rev Log: - Don't redo things that have already been done in AddGenericHeaderIPv4 Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Wed Dec 17 06:14:26 2008 @@ -47,8 +47,6 @@ if (!NT_SUCCESS(Status)) return Status; - /* Build UDP header */ - UDPHeader = (PUDP_HEADER)((ULONG_PTR)IPPacket->Data - sizeof(UDP_HEADER)); /* Port values are already big-endian values */ UDPHeader->SourcePort = LocalPort; UDPHeader->DestPort = RemotePort; @@ -56,8 +54,6 @@ UDPHeader->Checksum = 0; /* Length of UDP header and data */ UDPHeader->Length = WH2N(DataLength + sizeof(UDP_HEADER)); - - IPPacket->Data = ((PCHAR)UDPHeader) + sizeof(UDP_HEADER); TI_DbgPrint(MID_TRACE, ("Packet: %d ip %d udp %d payload\n", (PCHAR)UDPHeader - (PCHAR)IPPacket->Header,

15 years, 9 months

[dchapyshev] 38143: - Implement __lconv_init

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Dec 17 04:24:13 2008 New Revision: 38143 URL: http://svn.reactos.org/svn/reactos?rev=38143&view=rev Log: - Implement __lconv_init Modified: trunk/reactos/lib/sdk/crt/locale/locale.c Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Wed Dec 17 04:24:13 2008 @@ -802,7 +802,15 @@ */ void __lconv_init(void) { - FIXME(" stub\n"); + char Char = (char) UCHAR_MAX; + + TRACE("__lconv_init()\n"); + + _lconv.int_frac_digits = Char; + _lconv.frac_digits = Char; + _lconv.p_sep_by_space = _lconv.n_sep_by_space = Char; + _lconv.p_cs_precedes = _lconv.n_cs_precedes = Char; + _lconv.p_sign_posn = _lconv.n_sign_posn = Char; }

15 years, 9 months

[dgorbachev] 38142: Allow to dynamically load a library which uses static TLS.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Tue Dec 16 23:51:06 2008 New Revision: 38142 URL: http://svn.reactos.org/svn/reactos?rev=38142&view=rev Log: Allow to dynamically load a library which uses static TLS. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Tue Dec 16 23:51:06 2008 @@ -225,6 +225,7 @@ } } } + DPRINT("LdrpInitializeTlsForThread() done\n"); return STATUS_SUCCESS; } @@ -281,7 +282,7 @@ DbgPrint("EndAddressOfRawData: %x\n", TlsDirectory->EndAddressOfRawData); DbgPrint("SizeOfRawData: %d\n", TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData); DbgPrint("AddressOfIndex: %x\n", TlsDirectory->AddressOfIndex); - DbgPrint("AddressOfCallBacks: %x (%x)\n", TlsDirectory->AddressOfCallBacks, *TlsDirectory->AddressOfCallBacks); + DbgPrint("AddressOfCallBacks: %x\n", TlsDirectory->AddressOfCallBacks); DbgPrint("SizeOfZeroFill: %d\n", TlsDirectory->SizeOfZeroFill); DbgPrint("Characteristics: %x\n", TlsDirectory->Characteristics); #endif @@ -294,6 +295,7 @@ Entry = Entry->Flink; } } + DPRINT("LdrpInitializeTlsForProccess() done\n"); return STATUS_SUCCESS; } @@ -613,7 +615,6 @@ DosName, NULL) == 0) return STATUS_DLL_NOT_FOUND; - if (!RtlDosPathNameToNtPathName_U (DosName, &FullNtFileName, @@ -1696,14 +1697,15 @@ TlsSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData + TlsDirectory->SizeOfZeroFill; - if (TlsSize > 0 && - NtCurrentPeb()->Ldr->Initialized) + + if (TlsSize > 0 && NtCurrentPeb()->Ldr->Initialized) { - TRACE_LDR("Trying to load dynamicly %wZ which contains a tls directory\n", + TRACE_LDR("Trying to dynamically load %wZ which contains a TLS directory\n", &Module->BaseDllName); - return STATUS_UNSUCCESSFUL; + TlsDirectory = NULL; } } + /* * Process each import module. */ @@ -1766,7 +1768,7 @@ else { TRACE_LDR("%wZ has correct binding to %wZ\n", - &Module->BaseDllName, &ImportedModule->BaseDllName); + &Module->BaseDllName, &ImportedModule->BaseDllName); } if (BoundImportDescriptorCurrent->NumberOfModuleForwarderRefs) {

15 years, 9 months

[dgorbachev] 38141: In GetQueuedCompletionStatus function: - change order of arguments of NtRemoveIoCompletion function, - check maybe it returns STATUS_TIMEOUT.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Tue Dec 16 23:50:20 2008 New Revision: 38141 URL: http://svn.reactos.org/svn/reactos?rev=38141&view=rev Log: In GetQueuedCompletionStatus function: - change order of arguments of NtRemoveIoCompletion function, - check maybe it returns STATUS_TIMEOUT. Modified: trunk/reactos/dll/win32/kernel32/file/iocompl.c Modified: trunk/reactos/dll/win32/kernel32/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/io… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/iocompl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/iocompl.c [iso-8859-1] Tue Dec 16 23:50:20 2008 @@ -99,9 +99,10 @@ { NTSTATUS errCode; IO_STATUS_BLOCK IoStatus; + ULONG_PTR CompletionKey; LARGE_INTEGER Interval; - if (!lpNumberOfBytesTransferred||!lpCompletionKey||!lpOverlapped) + if (!lpNumberOfBytesTransferred || !lpCompletionKey || !lpOverlapped) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -113,18 +114,19 @@ } errCode = NtRemoveIoCompletion(CompletionHandle, - (PVOID*)lpCompletionKey, - (PVOID*)lpNumberOfBytesTransferred, + (PVOID*)&CompletionKey, + (PVOID*)lpOverlapped, &IoStatus, dwMilliseconds == INFINITE ? NULL : &Interval); - if (!NT_SUCCESS(errCode)) { + if (!NT_SUCCESS(errCode) || errCode == STATUS_TIMEOUT) { *lpOverlapped = NULL; SetLastErrorByStatus(errCode); return FALSE; } - *lpOverlapped = (LPOVERLAPPED)IoStatus.Information; + *lpCompletionKey = CompletionKey; + *lpNumberOfBytesTransferred = IoStatus.Information; if (!NT_SUCCESS(IoStatus.Status)){ //failed io operation @@ -133,7 +135,6 @@ } return TRUE; - } @@ -152,10 +153,10 @@ NTSTATUS errCode; errCode = NtSetIoCompletion(CompletionHandle, - (PVOID)dwCompletionKey, - (PVOID)lpOverlapped,//CompletionValue - STATUS_SUCCESS, //IoStatusBlock->Status - dwNumberOfBytesTransferred); //IoStatusBlock->Information + (PVOID)dwCompletionKey, // KeyContext + (PVOID)lpOverlapped, // ApcContext + STATUS_SUCCESS, // IoStatusBlock->Status + dwNumberOfBytesTransferred); // IoStatusBlock->Information if ( !NT_SUCCESS(errCode) ) {

15 years, 9 months

[sginsberg] 38140: - Hack-skip the gdi32 font test in an attempt to fix the infinite loop build server encounters

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Dec 16 23:46:56 2008 New Revision: 38140 URL: http://svn.reactos.org/svn/reactos?rev=38140&view=rev Log: - Hack-skip the gdi32 font test in an attempt to fix the infinite loop build server encounters Modified: trunk/rostests/winetests/gdi32/font.c Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Tue Dec 16 23:46:56 2008 @@ -284,6 +284,9 @@ TEXTMETRICA tm_orig; SIZE size_orig; INT ret, i, width_orig, height_orig, scale, lfWidth; + + skip("ROS-HACK: Skipping bitmap font tests!\n"); + return; hdc = GetDC(0);

15 years, 9 months

[tkreuzer] 38139: revert 38134, it breaks other stuff

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 16 19:36:21 2008 New Revision: 38139 URL: http://svn.reactos.org/svn/reactos?rev=38139&view=rev Log: revert 38134, it breaks other stuff Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Tue Dec 16 19:36:21 2008 @@ -7,7 +7,7 @@ <file>_newmode.c</file> <file>_wgetopt.c</file> <file>argv.c</file> -  + <file>atonexit.c</file> <file>binmode.c</file> <file>charmax.c</file> <file>cinitexe.c</file> @@ -25,9 +25,9 @@ <file>pseudo-reloc-list.c</file> <file>tlssup.c</file> <file>wildcard.c</file> -  + <file>xncommod.c</file> <file>xthdloc.c</file> -  + <file>xtxtmode.c</file> </module> <module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true" crt="dll"> <include base="mingw_common">include</include>

15 years, 9 months

[tkreuzer] 38138: Update ntdll def file

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 16 19:30:12 2008 New Revision: 38138 URL: http://svn.reactos.org/svn/reactos?rev=38138&view=rev Log: Update ntdll def file Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] Tue Dec 16 19:30:12 2008 @@ -600,7 +600,7 @@ ;RtlAllocateMemoryBlockLookaside ;RtlAllocateMemoryZone RtlAnsiCharToUnicodeChar -;RtlAnsiStringToUnicodeSize +RtlAnsiStringToUnicodeSize=RtlxAnsiStringToUnicodeSize RtlAnsiStringToUnicodeString RtlAppendAsciizToString ;RtlAppendPathElement @@ -699,8 +699,8 @@ RtlDeactivateActivationContext RtlDeactivateActivationContextUnsafeFast ;RtlDebugPrintTimes -;RtlDecodePointer -;RtlDecodeSystemPointer +RtlDecodePointer=RtlEncodePointer +RtlDecodeSystemPointer=RtlEncodeSystemPointer RtlDecompressBuffer RtlDecompressFragment ;RtlDefaultNpAcl @@ -987,7 +987,7 @@ RtlNumberOfClearBits RtlNumberOfSetBits ;RtlNumberOfSetBitsUlongPtr -;RtlOemStringToUnicodeSize +RtlOemStringToUnicodeSize=RtlxOemStringToUnicodeSize RtlOemStringToUnicodeString RtlOemToUnicodeN RtlOpenCurrentUser @@ -1028,7 +1028,7 @@ RtlRaiseException RtlRaiseStatus RtlRandom -RtlRandomEx +RtlRandomEx=RtlRandom RtlReAllocateHeap ;RtlReadMemoryStream ;RtlReadOutOfProcessMemoryStream @@ -1054,7 +1054,7 @@ ;RtlResetMemoryZone RtlResetRtlTranslations ;RtlRestoreContext -;RtlRestoreLastWin32Error +RtlRestoreLastWin32Error=RtlSetLastWin32Error ;RtlRetrieveNtUserPfn ;RtlRevertMemoryStream RtlRunDecodeUnicodeString @@ -1140,11 +1140,11 @@ RtlTryEnterCriticalSection RtlUnhandledExceptionFilter ;RtlUnhandledExceptionFilter2 -;RtlUnicodeStringToAnsiSize +RtlUnicodeStringToAnsiSize=RtlxUnicodeStringToAnsiSize RtlUnicodeStringToAnsiString RtlUnicodeStringToCountedOemString RtlUnicodeStringToInteger -;RtlUnicodeStringToOemSize +RtlUnicodeStringToOemSize=RtlxUnicodeStringToOemSize RtlUnicodeStringToOemString RtlUnicodeToCustomCPN RtlUnicodeToMultiByteN

15 years, 9 months

[tkreuzer] 38137: comment out a few exports, now msvcrt can be built

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 16 19:29:41 2008 New Revision: 38137 URL: http://svn.reactos.org/svn/reactos?rev=38137&view=rev Log: comment out a few exports, now msvcrt can be built Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt-amd64.def [iso-8859-1] Tue Dec 16 19:29:41 2008 @@ -77,7 +77,7 @@ _CItan @72 _CItanh @73 _CxxThrowException @74 - _EH_prolog @75 +; _EH_prolog @75 ??? _Getdays @76 _Getmonths @77 _Gettnames @78 @@ -89,9 +89,9 @@ ; __CxxCallUnwindVecDtor @84 __CxxDetectRethrow @85 ; __CxxExceptionFilter @86 - __CxxFrameHandler @87 +; __CxxFrameHandler @87 ??? ; __CxxFrameHandler2 @88 - __CxxLongjmpUnwind @89 +; __CxxLongjmpUnwind @89 ??? __CxxQueryExceptionSize @90 ; __CxxRegisterExceptionObject @91 ; __CxxUnregisterExceptionObject @92 @@ -120,7 +120,7 @@ __fpecode @115 __getmainargs @116 __initenv @117 - __iob_func @118 +; __iob_func @118 __isascii @119 __iscsym @120 __iscsymf @121 @@ -290,8 +290,8 @@ _fstat64 @284 _fstati64 @285 _ftime @286 - _ftime64 @287 - _ftol @288 +; _ftime64 @287 ??? +; _ftol @288 ??? _fullpath @289 _futime @290 ; _futime64 @291 @@ -316,7 +316,7 @@ ; _getwche @310 _getws @311 _global_unwind2 @312 - _gmtime64 @313 +; _gmtime64 @313 ??? _heapadd @314 _heapchk @315 _heapmin @316 @@ -372,7 +372,7 @@ _lfind @366 _loaddll @367 _local_unwind2 @368 - _localtime64 @369 +; _localtime64 @369 ??? _lock @370 _locking @371 _logb @372 @@ -485,13 +485,13 @@ ; _scprintf @479 ; _scwprintf @480 _searchenv @481 - _seh_longjmp_unwind=_seh_longjmp_unwind@4 @482 +; _seh_longjmp_unwind @482 ??? ; _set_SSE2_enable @483 _set_error_mode @484 _set_sbh_threshold @485 _seterrormode @486 _setjmp @487 - _setjmp3 @488 + _setjmpex @488 _setmaxstdio @489 _setmbcp @490 _setmode @491 @@ -740,7 +740,7 @@ ldexp @734 ldiv @735 localeconv @736 - localtime @737 +; localtime @737 ??? log @738 log10 @739 longjmp @740

15 years, 9 months

[tkreuzer] 38136: fix overcomplicated and broken definitions of __iob_func and _iob

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 16 19:28:37 2008 New Revision: 38136 URL: http://svn.reactos.org/svn/reactos?rev=38136&view=rev Log: fix overcomplicated and broken definitions of __iob_func and _iob Modified: branches/ros-amd64-bringup/reactos/include/crt/stdio.h branches/ros-amd64-bringup/reactos/include/crt/wchar.h Modified: branches/ros-amd64-bringup/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/stdio.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/stdio.h [iso-8859-1] Tue Dec 16 19:28:37 2008 @@ -91,18 +91,8 @@ #endif #ifndef _STDIO_DEFINED -#ifdef _WIN64 _CRTIMP FILE *__cdecl __iob_func(void); -#else -#ifdef _MSVCRT_ -extern FILE _iob[]; /* A pointer to an array of FILE */ -#define __iob_func() (_iob) -#else -extern FILE (*_imp___iob)[]; /* A pointer to an array of FILE */ -#define __iob_func() (*_imp___iob) -#define _iob __iob_func() -#endif -#endif + _CRTIMP extern FILE _iob[]; #endif #ifndef _FPOS_T_DEFINED @@ -120,11 +110,16 @@ #endif #ifndef _STDSTREAM_DEFINED -#define _STDSTREAM_DEFINED - -#define stdin (&__iob_func()[0]) -#define stdout (&__iob_func()[1]) -#define stderr (&__iob_func()[2]) + #define _STDSTREAM_DEFINED + #ifdef _M_CEE_PURE + #define stdin (&__iob_func()[0]) + #define stdout (&__iob_func()[1]) + #define stderr (&__iob_func()[2]) + #else // !_M_CEE_PURE + #define stdin (&_iob[0]) + #define stdout (&_iob[1]) + #define stderr (&_iob[2]) + #endif #endif #define _IOREAD 0x0001 @@ -403,7 +398,7 @@ #endif #define _STDIO_DEFINED -#endif +#endif // !_STDIO_DEFINED #define _fgetc_nolock(_stream) (--(_stream)->_cnt >= 0 ? 0xff & *(_stream)->_ptr++ : _filbuf(_stream)) #define _fputc_nolock(_c,_stream) (--(_stream)->_cnt >= 0 ? 0xff & (*(_stream)->_ptr++ = (char)(_c)) : _flsbuf((_c),(_stream))) Modified: branches/ros-amd64-bringup/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/wchar.h [iso-8859-1] Tue Dec 16 19:28:37 2008 @@ -51,20 +51,8 @@ #endif #ifndef _STDIO_DEFINED -#ifdef _WIN64 _CRTIMP FILE *__cdecl __iob_func(void); -#else -#ifdef _MSVCRT_ -extern FILE _iob[]; /* A pointer to an array of FILE */ -#define __iob_func() (_iob) -#else -extern FILE (*_imp___iob)[]; /* A pointer to an array of FILE */ -#define __iob_func() (*_imp___iob) -#define _iob __iob_func() -#endif -#endif - -#define _iob __iob_func() + _CRTIMP extern FILE _iob[]; #endif #ifndef _STDSTREAM_DEFINED

15 years, 9 months

[tkreuzer] 38135: fix _locaktime64 for x86

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 16 19:27:37 2008 New Revision: 38135 URL: http://svn.reactos.org/svn/reactos?rev=38135&view=rev Log: fix _locaktime64 for x86 Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ctime.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ctime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] Tue Dec 16 19:27:37 2008 @@ -1035,8 +1035,9 @@ _localtime64(const __time64_t * CPP_CONST timep) { static struct tm tm; - - localsub(timep, 0L, &tm); + time_t lt = *timep; + + localsub(&lt, 0L, &tm); return &tm; }

15 years, 9 months

← Newer
1
...
33
34
35
36
37
38
39
...
71
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 December 2008