Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 13134: made SetErrorMode() thread-safe
by weiden＠svn.reactos.com 19 Jan '05

19 Jan '05

made SetErrorMode() thread-safe Modified: trunk/reactos/lib/kernel32/except/except.c _____ Modified: trunk/reactos/lib/kernel32/except/except.c --- trunk/reactos/lib/kernel32/except/except.c 2005-01-19 14:25:10 UTC (rev 13133) +++ trunk/reactos/lib/kernel32/except/except.c 2005-01-19 19:14:56 UTC (rev 13134) @@ -15,25 +15,18 @@ #define NDEBUG #include "../include/debug.h" -UINT GlobalErrMode = 0; +UINT GlobalErrorMode = 0; LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter = UnhandledExceptionFilter; -UINT GetErrorMode(void) -{ - return GlobalErrMode; -} - /* * @implemented */ UINT STDCALL -SetErrorMode( UINT uMode ) +SetErrorMode(UINT uMode) { - UINT OldErrMode = GetErrorMode(); - GlobalErrMode = uMode; - return OldErrMode; + return (UINT)InterlockedExchange((LONG*)&GlobalErrorMode, (LONG)uMode); } @@ -121,7 +114,7 @@ return EXCEPTION_CONTINUE_SEARCH; } - if ((GetErrorMode() & SEM_NOGPFAULTERRORBOX) == 0) + if ((GlobalErrorMode & SEM_NOGPFAULTERRORBOX) == 0) { #ifdef _X86_ PULONG Frame;

1 0

[gvg] 13133: tinus <o112w8r02@sneakemail.com>
by gvg＠svn.reactos.com 19 Jan '05

19 Jan '05

tinus <o112w8r02(a)sneakemail.com> This patch fixes some weirdness in the clipping logic. It also seems to make these 'black cursor' images happen less often, but I can't tell for sure. Modified: trunk/reactos/include/win32k/dc.h Modified: trunk/reactos/subsys/win32k/eng/mouse.c _____ Modified: trunk/reactos/include/win32k/dc.h --- trunk/reactos/include/win32k/dc.h 2005-01-19 14:15:29 UTC (rev 13132) +++ trunk/reactos/include/win32k/dc.h 2005-01-19 14:25:10 UTC (rev 13133) @@ -124,7 +124,8 @@ RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ PGD_MOVEPOINTER MovePointer; ULONG Status; - BOOL SafetySwitch; + UINT SafetyRemoveLevel; /* at what level was the cursor removed? + 0 for not removed */ UINT SafetyRemoveCount; } GDIPOINTER, *PGDIPOINTER; _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2005-01-19 14:15:29 UTC (rev 13132) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2005-01-19 14:25:10 UTC (rev 13133) @@ -68,16 +68,20 @@ tmp = HazardY2; HazardY2 = HazardY1; HazardY1 = tmp; } + pgp->SafetyRemoveCount++; + + if (pgp->SafetyRemoveLevel) + { + /* already hidden */ + return FALSE; + } + if (pgp->Exclude.right >= HazardX1 && pgp->Exclude.left <= HazardX2 && pgp->Exclude.bottom >= HazardY1 && pgp->Exclude.top <= HazardY2) { - if (0 != pgp->SafetyRemoveCount++) - { - return FALSE; - } - pgp->SafetySwitch = TRUE; + pgp->SafetyRemoveLevel = pgp->SafetyRemoveCount; if (pgp->MovePointer) pgp->MovePointer(SurfObj, -1, -1, NULL); else @@ -113,26 +117,23 @@ return FALSE; } - if (pgp->SafetySwitch) - { - if (1 < pgp->SafetyRemoveCount--) - { - /* Someone else removed it too, let them restore it */ - return FALSE; - } - /* FIXME - this is wrong!!!!!! we must NOT access pgp->Pos from here, it's - a private field for ENG/driver. This will paint the cursor to the - wrong screen coordinates when a driver overrides DrvMovePointer()! - We should store the coordinates before calling Drv/EngMovePointer() - and Drv/EngSetPointerShape() separately in the GDIDEVICE structure - or somewhere where ntuser can access it! */ - if (pgp->MovePointer) - pgp->MovePointer(SurfObj, pgp->Pos.x, pgp->Pos.y, &pgp->Exclude); - else - EngMovePointer(SurfObj, pgp->Pos.x, pgp->Pos.y, &pgp->Exclude); - pgp->SafetySwitch = FALSE; - } + if (--pgp->SafetyRemoveCount >= pgp->SafetyRemoveLevel) + { + return FALSE; + } + /* FIXME - this is wrong!!!!!! we must NOT access pgp->Pos from here, it's + a private field for ENG/driver. This will paint the cursor to the + wrong screen coordinates when a driver overrides DrvMovePointer()! + We should store the coordinates before calling Drv/EngMovePointer() + and Drv/EngSetPointerShape() separately in the GDIDEVICE structure + or somewhere where ntuser can access it! */ + if (pgp->MovePointer) + pgp->MovePointer(SurfObj, pgp->Pos.x, pgp->Pos.y, &pgp->Exclude); + else + EngMovePointer(SurfObj, pgp->Pos.x, pgp->Pos.y, &pgp->Exclude); + pgp->SafetyRemoveLevel = 0; + return(TRUE); }

1 0

[gvg] 13132: tinus <o112w8r02@sneakemail.com>
by gvg＠svn.reactos.com 19 Jan '05

19 Jan '05

tinus <o112w8r02(a)sneakemail.com> Prevent part of "My Computer" icon being erased during startup Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-01-19 06:51:35 UTC (rev 13131) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-01-19 14:15:29 UTC (rev 13132) @@ -220,7 +220,7 @@ NewCursor->IconInfo.yHotspot, CurInfo->x, CurInfo->y, - NULL, + &(GDIDEV(SurfObj)->Pointer.Exclude), SPS_CHANGE); DPRINT("SetCursor: DrvSetPointerShape() returned %x\n", GDIDEV(SurfObj)->Pointer.Status); @@ -238,7 +238,7 @@ NewCursor->IconInfo.yHotspot, CurInfo->x, CurInfo->y, - NULL, + &(GDIDEV(SurfObj)->Pointer.Exclude), SPS_CHANGE); GDIDEV(SurfObj)->Pointer.MovePointer = EngMovePointer; }

1 0

[sedwards] 13131: Change UNIMPLEMENTED to DPRINT1 for NtGdiRemoveFontResource to make the MS Office installer a little more happy
by sedwards＠svn.reactos.com 19 Jan '05

19 Jan '05

Change UNIMPLEMENTED to DPRINT1 for NtGdiRemoveFontResource to make the MS Office installer a little more happy Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-01-19 03:33:43 UTC (rev 13130) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-01-19 06:51:35 UTC (rev 13131) @@ -2661,7 +2661,7 @@ STDCALL NtGdiRemoveFontResource(LPCWSTR FileName) { - UNIMPLEMENTED; + DPRINT1("NtGdiRemoveFontResource is UNIMPLEMENTED\n"); return FALSE; }

1 0

[ion] 13130: Bug fixes against uninitizlied variables and support for tree-wide optimization (do not try yet, crashes in bootvid).
by ion＠svn.reactos.com 19 Jan '05

19 Jan '05

Bug fixes against uninitizlied variables and support for tree-wide optimization (do not try yet, crashes in bootvid). Modified: trunk/reactos/config Modified: trunk/reactos/drivers/lib/ip/transport/datagram/datagram.c Modified: trunk/reactos/drivers/net/afd/afd/connect.c Modified: trunk/reactos/drivers/net/afd/afd/write.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/info.c Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/lib/epsapi/enum/drivers.c Modified: trunk/reactos/lib/msafd/misc/dllmain.c Modified: trunk/reactos/lib/shellext/slayer/slayer.c Modified: trunk/reactos/lib/ws2_32/misc/ns.c Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/regtests/shared/regtests.h Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsys/win32k/makefile Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/config 2005-01-19 03:33:43 UTC (rev 13130) @@ -30,7 +30,7 @@ # # Whether to compile with optimizations # -OPTIMIZED := 0 +OPTIMIZED := 0 # # Whether to compile a multiprocessor or single processor version _____ Modified: trunk/reactos/drivers/lib/ip/transport/datagram/datagram.c --- trunk/reactos/drivers/lib/ip/transport/datagram/datagram.c 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/drivers/lib/ip/transport/datagram/datagram.c 2005-01-19 03:33:43 UTC (rev 13130) @@ -59,7 +59,7 @@ if (!IsListEmpty(&AddrFile->ReceiveQueue)) { PLIST_ENTRY CurrentEntry; - PDATAGRAM_RECEIVE_REQUEST Current; + PDATAGRAM_RECEIVE_REQUEST Current = NULL; BOOLEAN Found; PTA_IP_ADDRESS RTAIPAddress; _____ Modified: trunk/reactos/drivers/net/afd/afd/connect.c --- trunk/reactos/drivers/net/afd/afd/connect.c 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/drivers/net/afd/afd/connect.c 2005-01-19 03:33:43 UTC (rev 13130) @@ -41,7 +41,7 @@ } NTSTATUS MakeSocketIntoConnection( PAFD_FCB FCB ) { - NTSTATUS Status; + NTSTATUS Status = STATUS_NO_MEMORY; /* Allocate the receive area and start receiving */ FCB->Recv.Window = _____ Modified: trunk/reactos/drivers/net/afd/afd/write.c --- trunk/reactos/drivers/net/afd/afd/write.c 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/drivers/net/afd/afd/write.c 2005-01-19 03:33:43 UTC (rev 13130) @@ -22,7 +22,7 @@ PLIST_ENTRY NextIrpEntry; PIRP NextIrp = NULL; PIO_STACK_LOCATION NextIrpSp; - PAFD_SEND_INFO SendReq; + PAFD_SEND_INFO SendReq = NULL; PAFD_MAPBUF Map; UINT TotalBytesCopied = 0, SpaceAvail, i, CopySize = 0; _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/info.c --- trunk/reactos/drivers/net/tcpip/tcpip/info.c 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/drivers/net/tcpip/tcpip/info.c 2005-01-19 03:33:43 UTC (rev 13130) @@ -129,10 +129,10 @@ { KIRQL OldIrql; UINT i; - PVOID context; + PVOID context = NULL; NTSTATUS Status = STATUS_SUCCESS; BOOL FoundEntity = FALSE; - InfoRequest_f InfoRequest; + InfoRequest_f InfoRequest = NULL; TI_DbgPrint(MAX_TRACE, ("InfoEx Req: %x %x %x!%04x:%d\n", _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-01-19 03:33:43 UTC (rev 13130) @@ -121,7 +121,7 @@ DWORD ChannelSelect; DWORD Controller; ULONG MaximumLength; - BOOLEAN ChannelSetup; + BOOLEAN ChannelSetup = FALSE; DMA_MODE DmaMode; DPRINT("Entered Function\n"); _____ Modified: trunk/reactos/lib/epsapi/enum/drivers.c --- trunk/reactos/lib/epsapi/enum/drivers.c 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/lib/epsapi/enum/drivers.c 2005-01-19 03:33:43 UTC (rev 13130) @@ -67,7 +67,7 @@ PsaCaptureSystemModules(OUT PSYSTEM_MODULE_INFORMATION *SystemModules) { SIZE_T nSize = 0; - PSYSTEM_MODULE_INFORMATION psmModules; + PSYSTEM_MODULE_INFORMATION psmModules = NULL; NTSTATUS Status; #if 0 @@ -94,7 +94,7 @@ pool/heap, we try to determine the buffer size in advance, knowing that the number of elements is unlikely to change */ nSize = sizeof(SYSTEM_MODULE_INFORMATION) + - ((psmModules->Count - 1) * sizeof(SYSTEM_MODULE_INFORMATION)); + (nSize * sizeof(SYSTEM_MODULE_INFORMATION)); psmModules = NULL; _____ Modified: trunk/reactos/lib/msafd/misc/dllmain.c --- trunk/reactos/lib/msafd/misc/dllmain.c 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/lib/msafd/misc/dllmain.c 2005-01-19 03:33:43 UTC (rev 13130) @@ -66,7 +66,7 @@ PHELPER_DATA HelperData; PVOID HelperDLLContext; DWORD HelperEvents; - DWORD IOOptions; + DWORD IOOptions = 0; UNICODE_STRING TransportName; UNICODE_STRING DevName; LARGE_INTEGER GroupData; @@ -728,8 +728,8 @@ NTSTATUS Status; struct fd_set ReadSet; struct timeval Timeout; - PVOID PendingData; - ULONG PendingDataLength; + PVOID PendingData = NULL; + ULONG PendingDataLength = 0; PVOID CalleeDataBuffer; WSABUF CallerData, CalleeID, CallerID, CalleeData; PSOCKADDR RemoteAddress = NULL; _____ Modified: trunk/reactos/lib/shellext/slayer/slayer.c --- trunk/reactos/lib/shellext/slayer/slayer.c 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/lib/shellext/slayer/slayer.c 2005-01-19 03:33:43 UTC (rev 13130) @@ -860,7 +860,7 @@ HRESULT STDCALL DllRegisterServer(VOID) { - LONG e; + LONG e = E_ACCESSDENIED; HKEY hk; WCHAR szGuid[40]; WCHAR szDescription[255]; _____ Modified: trunk/reactos/lib/ws2_32/misc/ns.c --- trunk/reactos/lib/ws2_32/misc/ns.c 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/lib/ws2_32/misc/ns.c 2005-01-19 03:33:43 UTC (rev 13130) @@ -7,6 +7,7 @@ * REVISIONS: * CSH 01/09-2000 Created */ +#define __NO_CTYPE_INLINES #include <ctype.h> #include <ws2_32.h> #include <winbase.h> _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/ntoskrnl/Makefile 2005-01-19 03:33:43 UTC (rev 13130) @@ -26,12 +26,6 @@ LINKER_SCRIPT := ntoskrnl.lnk STRIP_FLAGS := -Wl,-s -ifeq ($(OPTIMIZED), 1) -CFLAGS_OPT := -O2 -Wno-strict-aliasing -else -CFLAGS_OPT := -endif - ifeq ($(KDBG), 1) OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o dbg/rdebug.o \ dbg/i386/kdb_help.o \ _____ Modified: trunk/reactos/regtests/shared/regtests.h --- trunk/reactos/regtests/shared/regtests.h 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/regtests/shared/regtests.h 2005-01-19 03:33:43 UTC (rev 13130) @@ -206,7 +206,7 @@ FrameworkGetFunction(PAPI_DESCRIPTION ApiDescription) { HANDLE hModule; - PVOID function; + PVOID function = NULL; PCHAR exportedFunctionName; exportedFunctionName = FrameworkGetExportedFunctionNameInternal(ApiDescription); _____ Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c --- trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-01-19 03:33:43 UTC (rev 13130) @@ -737,7 +737,7 @@ static LRESULT CALLBACK GuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - LRESULT Result; + LRESULT Result = 0; switch(msg) { @@ -746,7 +746,6 @@ break; case WM_PAINT: GuiConsoleHandlePaint(hWnd); - Result = 0; break; case WM_KEYDOWN: case WM_KEYUP: @@ -754,19 +753,15 @@ case WM_SYSKEYUP: case WM_CHAR: GuiConsoleHandleKey(hWnd, msg, wParam, lParam); - Result = 0; break; case WM_TIMER: GuiConsoleHandleTimer(hWnd); - Result = 0; break; case WM_CLOSE: GuiConsoleHandleClose(hWnd); - Result = 0; break; case WM_NCDESTROY: GuiConsoleHandleNcDestroy(hWnd); - Result = 0; break; case WM_LBUTTONDOWN: GuiConsoleLeftMouseDown(hWnd, lParam); _____ Modified: trunk/reactos/subsys/win32k/makefile --- trunk/reactos/subsys/win32k/makefile 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/subsys/win32k/makefile 2005-01-19 03:33:43 UTC (rev 13130) @@ -29,12 +29,6 @@ CFLAGS_DBG := endif -ifeq ($(OPTIMIZED), 1) -CFLAGS_OPT := -O2 -Wno-strict-aliasing -else -CFLAGS_OPT := -endif - TARGET_CFLAGS =\ $(CFLAGS_DBG) \ -I. \ _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-01-19 01:37:35 UTC (rev 13129) +++ trunk/reactos/tools/helper.mk 2005-01-19 03:33:43 UTC (rev 13130) @@ -612,6 +612,15 @@ endif endif +# +# Enable Tree-Wide Optimization. +# Protect uncompatible files here with an ifneq +# if needed, until their problems can be found +# +ifeq ($(OPTIMIZED), 1) + MK_CFLAGS += -O2 -Wno-strict-aliasing + MK_CPPFLAGS += -O2 -Wno-strict-aliasing +endif ifneq ($(TARGET_LIBS),) MK_LIBS := $(TARGET_LIBS) $(MK_LIBS)

1 0

[royce] 13129: added 'first' attribute to <file>
by royce＠svn.reactos.com 19 Jan '05

19 Jan '05

added 'first' attribute to <file> Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml --- branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-19 01:11:43 UTC (rev 13128) +++ branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-19 01:37:35 UTC (rev 13129) @@ -26,10 +26,10 @@ </output> </invoke> - <directory name="ke">  + <directory name="ke"> <if property="ARCH" value="i386"> <directory name="i386"> - <file>multiboot.S</file>  + <file first>multiboot.S</file> <file>bios.c</file> <file>brkpoint.c</file> <file>bthread.S</file> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-19 01:11:43 UTC (rev 13128) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-19 01:37:35 UTC (rev 13129) @@ -447,6 +447,17 @@ if ( files.size() ) { + for ( i = 0; i < files.size(); i++ ) + { + if ( files[i]->first ) + { + fprintf ( fMakefile, + "%s := %s $(%s)\n", + objs_macro.c_str(), + GetObjectFilename(files[i]->name).c_str(), + objs_macro.c_str() ); + } + } fprintf ( fMakefile, "%s %s", @@ -455,7 +466,9 @@ for ( i = 0; i < files.size(); i++ ) { string extension = GetExtension ( files[i]->name ); - if ( extension != ".spec" && extension != ".SPEC" ) + if ( extension != ".spec" + && extension != ".SPEC" + && !files[i]->first ) { fprintf ( fMakefile, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-19 01:11:43 UTC (rev 13128) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-19 01:37:35 UTC (rev 13129) @@ -102,7 +102,9 @@ string subpath ( path ); if ( e.name == "file" && e.value.size () > 0 ) { - File* pFile = new File ( FixSeparator ( path + CSEP + e.value ) ); + const XMLAttribute* att = e.GetAttribute ( "first", false ); + File* pFile = new File ( FixSeparator ( path + CSEP + e.value ), + att != NULL ); if ( pIf ) pIf->files.push_back ( pFile ); else @@ -323,8 +325,8 @@ } -File::File ( const string& _name ) - : name(_name) +File::File ( const string& _name, bool _first ) + : name(_name), first(_first) { } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-19 01:11:43 UTC (rev 13128) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-19 01:37:35 UTC (rev 13129) @@ -168,8 +168,9 @@ { public: std::string name; + bool first; - File ( const std::string& _name ); + File ( const std::string& _name, bool _first ); void ProcessXML(); };

1 0

[ion] 13128: Fix hacks from last night and properly share the code
by ion＠svn.reactos.com 19 Jan '05

19 Jan '05

Fix hacks from last night and properly share the code Modified: trunk/reactos/lib/ntdll/rtl/ppb.c Modified: trunk/reactos/lib/ntdll/rtl/process.c Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c _____ Modified: trunk/reactos/lib/ntdll/rtl/ppb.c --- trunk/reactos/lib/ntdll/rtl/ppb.c 2005-01-18 22:47:16 UTC (rev 13127) +++ trunk/reactos/lib/ntdll/rtl/ppb.c 2005-01-19 01:11:43 UTC (rev 13128) @@ -30,6 +30,27 @@ /* FUNCTIONS ****************************************************************/ +/* + * @implemented + */ +VOID STDCALL +RtlAcquirePebLock(VOID) +{ + PPEB Peb = NtCurrentPeb (); + Peb->FastPebLockRoutine (Peb->FastPebLock); +} + + +/* + * @implemented + */ +VOID STDCALL +RtlReleasePebLock(VOID) +{ + PPEB Peb = NtCurrentPeb (); + Peb->FastPebUnlockRoutine (Peb->FastPebLock); +} + static inline VOID RtlpCopyParameterString(PWCHAR *Ptr, PUNICODE_STRING Destination, _____ Modified: trunk/reactos/lib/ntdll/rtl/process.c --- trunk/reactos/lib/ntdll/rtl/process.c 2005-01-18 22:47:16 UTC (rev 13127) +++ trunk/reactos/lib/ntdll/rtl/process.c 2005-01-19 01:11:43 UTC (rev 13128) @@ -48,6 +48,13 @@ ); } +PPEB +STDCALL +RtlpCurrentPeb(VOID) +{ + return NtCurrentPeb(); +} + static NTSTATUS RtlpMapFile(PUNICODE_STRING ImageFileName, PRTL_USER_PROCESS_PARAMETERS Ppb, _____ Modified: trunk/reactos/lib/rtl/env.c --- trunk/reactos/lib/rtl/env.c 2005-01-18 22:47:16 UTC (rev 13127) +++ trunk/reactos/lib/rtl/env.c 2005-01-19 01:11:43 UTC (rev 13128) @@ -20,33 +20,12 @@ #define NDEBUG #include <ntdll/ntdll.h> +PPEB STDCALL RtlpCurrentPeb(VOID); /* FUNCTIONS *****************************************************************/ -/* FIXME: Added here temporarly until I fix this properly tomorrow */ /* * @implemented */ -VOID STDCALL -RtlAcquirePebLock(VOID) -{ - PPEB Peb = NtCurrentPeb (); - Peb->FastPebLockRoutine (Peb->FastPebLock); -} - -/* FIXME: Added here temporarly until I fix this properly tomorrow */ -/* - * @implemented - */ -VOID STDCALL -RtlReleasePebLock(VOID) -{ - PPEB Peb = NtCurrentPeb (); - Peb->FastPebUnlockRoutine (Peb->FastPebLock); -} - -/* - * @implemented - */ NTSTATUS STDCALL RtlCreateEnvironment(BOOLEAN Inherit, PWSTR *Environment) @@ -533,12 +512,11 @@ if (Environment == NULL) { - if (NtCurrentPeb() == NULL) - { - return(STATUS_VARIABLE_NOT_FOUND); + PPEB Peb = RtlpCurrentPeb(); + if (Peb) { + Environment = Peb->ProcessParameters->Environment; + SysEnvUsed = TRUE; } - Environment = NtCurrentPeb()->ProcessParameters->Environment; - SysEnvUsed = TRUE; } if (Environment == NULL) _____ Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c --- trunk/reactos/ntoskrnl/rtl/libsupp.c 2005-01-18 22:47:16 UTC (rev 13127) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c 2005-01-19 01:11:43 UTC (rev 13128) @@ -11,6 +11,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> +#include <internal/ps.h> #define NDEBUG #include <internal/debug.h> @@ -19,6 +20,31 @@ /* FUNCTIONS *****************************************************************/ +/* + * @implemented + */ +VOID STDCALL +RtlAcquirePebLock(VOID) +{ + +} + +/* + * @implemented + */ +VOID STDCALL +RtlReleasePebLock(VOID) +{ + +} + +PPEB +STDCALL +RtlpCurrentPeb(VOID) +{ + return ((PEPROCESS)(KeGetCurrentThread()->ApcState.Process))->Peb; +} + NTSTATUS STDCALL RtlDeleteCriticalSection(

1 0

[ion] 13117: Fix to unbreak tree. This is temporary until I come up with a good NtCurrentPeb macro that can be shared. Note that the brekage is because an ntdll only function was put in rtl but never used from ntoskrnl until my previous patch. It could be shared, but I need to do some work on it.
by ion＠svn.reactos.com 18 Jan '05

18 Jan '05

Fix to unbreak tree. This is temporary until I come up with a good NtCurrentPeb macro that can be shared. Note that the brekage is because an ntdll only function was put in rtl but never used from ntoskrnl until my previous patch. It could be shared, but I need to do some work on it. Modified: trunk/reactos/lib/ntdll/rtl/ppb.c Modified: trunk/reactos/lib/rtl/env.c _____ Modified: trunk/reactos/lib/ntdll/rtl/ppb.c --- trunk/reactos/lib/ntdll/rtl/ppb.c 2005-01-18 05:52:54 UTC (rev 13116) +++ trunk/reactos/lib/ntdll/rtl/ppb.c 2005-01-18 06:00:55 UTC (rev 13117) @@ -30,27 +30,6 @@ /* FUNCTIONS ****************************************************************/ -/* - * @implemented - */ -VOID STDCALL -RtlAcquirePebLock(VOID) -{ - PPEB Peb = NtCurrentPeb (); - Peb->FastPebLockRoutine (Peb->FastPebLock); -} - - -/* - * @implemented - */ -VOID STDCALL -RtlReleasePebLock(VOID) -{ - PPEB Peb = NtCurrentPeb (); - Peb->FastPebUnlockRoutine (Peb->FastPebLock); -} - static inline VOID RtlpCopyParameterString(PWCHAR *Ptr, PUNICODE_STRING Destination, _____ Modified: trunk/reactos/lib/rtl/env.c --- trunk/reactos/lib/rtl/env.c 2005-01-18 05:52:54 UTC (rev 13116) +++ trunk/reactos/lib/rtl/env.c 2005-01-18 06:00:55 UTC (rev 13117) @@ -22,9 +22,31 @@ /* FUNCTIONS *****************************************************************/ +/* FIXME: Added here temporarly until I fix this properly tomorrow */ /* * @implemented */ +VOID STDCALL +RtlAcquirePebLock(VOID) +{ + PPEB Peb = NtCurrentPeb (); + Peb->FastPebLockRoutine (Peb->FastPebLock); +} + +/* FIXME: Added here temporarly until I fix this properly tomorrow */ +/* + * @implemented + */ +VOID STDCALL +RtlReleasePebLock(VOID) +{ + PPEB Peb = NtCurrentPeb (); + Peb->FastPebUnlockRoutine (Peb->FastPebLock); +} + +/* + * @implemented + */ NTSTATUS STDCALL RtlCreateEnvironment(BOOLEAN Inherit, PWSTR *Environment)

3 2

[weiden] 13127: fixed prototype of NtNotifyChangeKey()
by weiden＠svn.reactos.com 18 Jan '05

18 Jan '05

fixed prototype of NtNotifyChangeKey() Modified: trunk/reactos/include/ntos/zw.h Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-01-18 22:36:39 UTC (rev 13126) +++ trunk/reactos/include/ntos/zw.h 2005-01-18 22:47:16 UTC (rev 13127) @@ -1887,10 +1887,10 @@ IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, IN ULONG CompletionFilter, - IN BOOLEAN Asynchroneous, - OUT PVOID ChangeBuffer, + IN BOOLEAN WatchSubtree, + OUT PVOID Buffer, IN ULONG Length, - IN BOOLEAN WatchSubtree + IN BOOLEAN Asynchronous ); NTSTATUS @@ -1902,10 +1902,10 @@ IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, IN ULONG CompletionFilter, - IN BOOLEAN Asynchroneous, - OUT PVOID ChangeBuffer, + IN BOOLEAN WatchSubtree, + OUT PVOID Buffer, IN ULONG Length, - IN BOOLEAN WatchSubtree + IN BOOLEAN Asynchronous ); /* _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-18 22:36:39 UTC (rev 13126) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-18 22:47:16 UTC (rev 13127) @@ -1796,10 +1796,10 @@ IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, IN ULONG CompletionFilter, - IN BOOLEAN Asynchroneous, - OUT PVOID ChangeBuffer, + IN BOOLEAN WatchSubtree, + OUT PVOID Buffer, IN ULONG Length, - IN BOOLEAN WatchSubtree) + IN BOOLEAN Asynchronous) { UNIMPLEMENTED; return(STATUS_NOT_IMPLEMENTED);

1 0

[hyperion] 13126: Implemented TransmitFile (non-functional, depends on unimplemented features), added some missing definitions to mswsock.h
by hyperion＠svn.reactos.com 18 Jan '05

18 Jan '05

Implemented TransmitFile (non-functional, depends on unimplemented features), added some missing definitions to mswsock.h Modified: trunk/reactos/lib/mswsock/Makefile Added: trunk/reactos/lib/mswsock/extensions.c Modified: trunk/reactos/lib/mswsock/stubs.c Modified: trunk/reactos/w32api/include/mswsock.h _____ Modified: trunk/reactos/lib/mswsock/Makefile --- trunk/reactos/lib/mswsock/Makefile 2005-01-18 18:12:41 UTC (rev 13125) +++ trunk/reactos/lib/mswsock/Makefile 2005-01-18 22:36:39 UTC (rev 13126) @@ -20,9 +20,9 @@ TARGET_LFLAGS = -nostartfiles -nostdlib -TARGET_SDKLIBS = kernel32.a +TARGET_SDKLIBS = kernel32.a ws2_32.a -TARGET_OBJECTS = stubs.o +TARGET_OBJECTS = stubs.o extensions.o TARGET_CLEAN = $(DEP_FILES) _____ Added: trunk/reactos/lib/mswsock/extensions.c --- trunk/reactos/lib/mswsock/extensions.c 2005-01-18 18:12:41 UTC (rev 13125) +++ trunk/reactos/lib/mswsock/extensions.c 2005-01-18 22:36:39 UTC (rev 13126) @@ -0,0 +1,54 @@ +/* $Id: stubs.c 12852 2005-01-06 13:58:04Z mf $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock DLL + * FILE: stubs.c + * PURPOSE: WSAIoctl wrappers for Microsoft extensions to Winsock + * PROGRAMMERS: KJK::Hyperion <hackbunny(a)reactos.com> + * REVISIONS: + */ + +#include <windows.h> +#include <winsock2.h> +#include <mswsock.h> + +/* + * @implemented + */ +BOOL +STDCALL +TransmitFile(SOCKET Socket, + HANDLE File, + DWORD NumberOfBytesToWrite, + DWORD NumberOfBytesPerSend, + LPOVERLAPPED Overlapped, + LPTRANSMIT_FILE_BUFFERS TransmitBuffers, + DWORD Flags) +{ + static GUID TransmitFileGUID = WSAID_TRANSMITFILE; + LPFN_TRANSMITFILE pfnTransmitFile; + DWORD cbBytesReturned; + + if (WSAIoctl(Socket, + SIO_GET_EXTENSION_FUNCTION_POINTER, + &TransmitFileGUID, + sizeof(TransmitFileGUID), + &pfnTransmitFile, + sizeof(pfnTransmitFile), + &cbBytesReturned, + NULL, + NULL) == SOCKET_ERROR) + { + return FALSE; + } + + return pfnTransmitFile(Socket, + File, + NumberOfBytesToWrite, + NumberOfBytesPerSend, + Overlapped, + TransmitBuffers, + Flags); +} + +/* EOF */ _____ Modified: trunk/reactos/lib/mswsock/stubs.c --- trunk/reactos/lib/mswsock/stubs.c 2005-01-18 18:12:41 UTC (rev 13125) +++ trunk/reactos/lib/mswsock/stubs.c 2005-01-18 22:36:39 UTC (rev 13126) @@ -255,24 +255,6 @@ /* * @unimplemented */ -BOOL -STDCALL -TransmitFile(SOCKET Socket, - HANDLE File, - DWORD NumberOfBytesToWrite, - DWORD NumberOfBytesPerSend, - LPOVERLAPPED Overlapped, - LPTRANSMIT_FILE_BUFFERS TransmitBuffers, - DWORD Flags) -{ - OutputDebugStringW(L"w32sock TransmitFile stub called\n"); - - return FALSE; -} - -/* - * @unimplemented - */ int STDCALL WSARecvEx(SOCKET Sock, _____ Modified: trunk/reactos/w32api/include/mswsock.h --- trunk/reactos/w32api/include/mswsock.h 2005-01-18 18:12:41 UTC (rev 13125) +++ trunk/reactos/w32api/include/mswsock.h 2005-01-18 22:36:39 UTC (rev 13126) @@ -54,6 +54,14 @@ BOOL PASCAL AcceptEx(SOCKET,SOCKET,PVOID,DWORD,DWORD,DWORD,LPDWORD,LPOVERLAPPED); VOID PASCAL GetAcceptExSockaddrs(PVOID,DWORD,DWORD,DWORD,struct sockaddr**, LPINT, struct sockaddr**, LPINT); +#define WSAID_ACCEPTEX { 0xB5367DF0, 0xCBAC, 0x11CF, { 0x95, 0xCA, 0x00, 0x80, 0x5F, 0x48, 0xA1, 0x92 } } +#define WSAID_TRANSMITFILE { 0xB5367DF1, 0xCBAC, 0x11CF, { 0x95, 0xCA, 0x00, 0x80, 0x5F, 0x48, 0xA1, 0x92 } } +#define WSAID_GETACCEPTEXSOCKADDRS { 0xB5367DF2, 0xCBAC, 0x11CF, { 0x95, 0xCA, 0x00, 0x80, 0x5F, 0x48, 0xA1, 0x92 } } + +typedef BOOL (PASCAL *LPFN_TRANSMITFILE)(SOCKET,HANDLE,DWORD,DWORD,LPOVERLAPPED,LPTRANSMIT_FI LE_BUFFERS,DWORD); +typedef BOOL (PASCAL *LPFN_ACCEPTEX)(SOCKET,SOCKET,PVOID,DWORD,DWORD,DWORD,LPDWORD,LPOVERLAPP ED); +typedef VOID (PASCAL *LPFN_GETACCEPTEXSOCKADDRS)(PVOID,DWORD,DWORD,DWORD,struct sockaddr**, LPINT, struct sockaddr**, LPINT); + #ifdef _WINSOCK2_H /* These require the winsock2 interface. */ #define TP_ELEMENT_FILE 1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs