Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[cgutman] 58896: [LWIP] - Call tcp_shutdown() two different times for TX|RX shutdown to avoid the tcp_close() problem entirely - Forcefully close the socket in LibTCPCloseCallback (not optimal, but...

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Apr 30 09:33:40 2013 New Revision: 58896 URL: http://svn.reactos.org/svn/reactos?rev=58896&view=rev Log: [LWIP] - Call tcp_shutdown() two different times for TX|RX shutdown to avoid the tcp_close() problem entirely - Forcefully close the socket in LibTCPCloseCallback (not optimal, but good enough) Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Tue Apr 30 09:33:40 2013 @@ -631,7 +631,14 @@ goto done; } - msg->Output.Shutdown.Error = tcp_shutdown(pcb, msg->Input.Shutdown.shut_rx, msg->Input.Shutdown.shut_tx); + /* These need to be called separately, otherwise we get a tcp_close() */ + if (msg->Input.Shutdown.shut_rx) { + msg->Output.Shutdown.Error = tcp_shutdown(pcb, TRUE, FALSE); + } + if (msg->Input.Shutdown.shut_tx) { + msg->Output.Shutdown.Error = tcp_shutdown(pcb, FALSE, TRUE); + } + if (!msg->Output.Shutdown.Error) { if (msg->Input.Shutdown.shut_rx) @@ -642,10 +649,6 @@ if (msg->Input.Shutdown.shut_tx) msg->Input.Shutdown.Connection->SendShutdown = TRUE; - - /* Shutting down both sides is like a close to LwIP, so clear the context */ - if (msg->Input.Shutdown.shut_rx && msg->Input.Shutdown.shut_tx) - msg->Input.Shutdown.Connection->SocketContext = NULL; } done: @@ -706,7 +709,6 @@ case CLOSED: case LISTEN: case SYN_SENT: - case CLOSE_WAIT: msg->Output.Close.Error = tcp_close(pcb); if (!msg->Output.Close.Error && msg->Input.Close.Callback) @@ -714,8 +716,9 @@ break; default: - /* Start the graceful close process (or send RST for pending data) */ - msg->Output.Close.Error = tcp_close(pcb); + /* Abort the socket */ + tcp_abort(pcb); + msg->Output.Close.Error = ERR_OK; break; }

11 years, 4 months

[cgutman] 58895: [LWIP] - Don't define mem_trim() to realloc() because mem_trim() must never move the buffer pointer - Fix realloc() which was completely broken - Properly handle a TX|RX shutdown

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Apr 30 08:16:29 2013 New Revision: 58895 URL: http://svn.reactos.org/svn/reactos?rev=58895&view=rev Log: [LWIP] - Don't define mem_trim() to realloc() because mem_trim() must never move the buffer pointer - Fix realloc() which was completely broken - Properly handle a TX|RX shutdown Modified: trunk/reactos/lib/drivers/lwip/src/include/arch/cc.h trunk/reactos/lib/drivers/lwip/src/rosmem.c trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/lib/drivers/lwip/src/include/arch/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/include/arch/cc.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/include/arch/cc.h [iso-8859-1] Tue Apr 30 08:16:29 2013 @@ -15,7 +15,9 @@ void * realloc(void *mem, size_t size); -#define mem_trim(_m_, _s_) realloc(_m_, _s_) +/* mem_trim() must trim the buffer without relocating it. + * Since we can't do that, we just return the buffer passed in unchanged */ +#define mem_trim(_m_, _s_) (_m_) /* Unsigned int types */ typedef unsigned char u8_t; Modified: trunk/reactos/lib/drivers/lwip/src/rosmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rosme… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rosmem.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rosmem.c [iso-8859-1] Tue Apr 30 08:16:29 2013 @@ -31,9 +31,36 @@ ExFreePoolWithTag(mem, LWIP_TAG); } +/* This is only used to trim in lwIP */ void * realloc(void *mem, size_t size) { + void* new_mem; + + /* realloc() with a NULL mem pointer acts like a call to malloc() */ + if (mem == NULL) { + return malloc(size); + } + + /* realloc() with a size 0 acts like a call to free() */ + if (size == 0) { + free(mem); + return NULL; + } + + /* Allocate the new buffer first */ + new_mem = malloc(size); + if (new_mem == NULL) { + /* The old buffer is still intact */ + return NULL; + } + + /* Copy the data over */ + RtlCopyMemory(new_mem, mem, size); + + /* Deallocate the old buffer */ free(mem); - return malloc(size); + + /* Return the newly allocated block */ + return new_mem; } Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Tue Apr 30 08:16:29 2013 @@ -631,18 +631,8 @@ goto done; } - if (pcb->state == CLOSE_WAIT) - { - /* This case actually results in a socket closure later (lwIP bug?) */ - msg->Input.Shutdown.Connection->SocketContext = NULL; - } - msg->Output.Shutdown.Error = tcp_shutdown(pcb, msg->Input.Shutdown.shut_rx, msg->Input.Shutdown.shut_tx); - if (msg->Output.Shutdown.Error) - { - msg->Input.Shutdown.Connection->SocketContext = pcb; - } - else + if (!msg->Output.Shutdown.Error) { if (msg->Input.Shutdown.shut_rx) { @@ -652,6 +642,10 @@ if (msg->Input.Shutdown.shut_tx) msg->Input.Shutdown.Connection->SendShutdown = TRUE; + + /* Shutting down both sides is like a close to LwIP, so clear the context */ + if (msg->Input.Shutdown.shut_rx && msg->Input.Shutdown.shut_tx) + msg->Input.Shutdown.Connection->SocketContext = NULL; } done: @@ -712,6 +706,7 @@ case CLOSED: case LISTEN: case SYN_SENT: + case CLOSE_WAIT: msg->Output.Close.Error = tcp_close(pcb); if (!msg->Output.Close.Error && msg->Input.Close.Callback) @@ -719,20 +714,8 @@ break; default: - if (msg->Input.Close.Connection->SendShutdown && - msg->Input.Close.Connection->ReceiveShutdown) - { - /* Abort the connection */ - tcp_abort(pcb); - - /* Aborts always succeed */ - msg->Output.Close.Error = ERR_OK; - } - else - { - /* Start the graceful close process (or send RST for pending data) */ - msg->Output.Close.Error = tcp_close(pcb); - } + /* Start the graceful close process (or send RST for pending data) */ + msg->Output.Close.Error = tcp_close(pcb); break; }

11 years, 4 months

[zguo] 58894: [NET] Implementation of pause, continue, and help commands for net service application. Patch by theflash. Core-7131 #resolve

by zguo＠svn.reactos.org

Author: zguo Date: Tue Apr 30 02:57:30 2013 New Revision: 58894 URL: http://svn.reactos.org/svn/reactos?rev=58894&view=rev Log: [NET] Implementation of pause, continue, and help commands for net service application. Patch by theflash. Core-7131 #resolve Added: trunk/reactos/base/applications/network/net/cmdContinue.c (with props) trunk/reactos/base/applications/network/net/cmdHelpMsg.c (with props) trunk/reactos/base/applications/network/net/cmdPause.c (with props) Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt trunk/reactos/base/applications/network/net/help.c trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/net/net.h Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] Tue Apr 30 02:57:30 2013 @@ -5,6 +5,9 @@ main.c cmdstart.c cmdStop.c + cmdHelpMsg.c + cmdPause.c + cmdContinue.c help.c) add_executable(net ${SOURCE}) Added: trunk/reactos/base/applications/network/net/cmdContinue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdContinue.c (added) +++ trunk/reactos/base/applications/network/net/cmdContinue.c [iso-8859-1] Tue Apr 30 02:57:30 2013 @@ -1,0 +1,51 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: cmdContinue.c + * PURPOSE: + * + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#include "net.h" + +int cmdContinue(int argc, wchar_t *argv[]) +{ + int errorCode = 0; + SC_HANDLE hManager, hService; + SERVICE_STATUS status; + if(argc != 3) + { + puts("Usage: NET CONTINUE <Service Name>"); + return 1; + } + + hManager=OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ENUMERATE_SERVICE); + if(hManager == NULL) + { + printf("[OpenSCManager] Error: %d\n", errorCode = GetLastError()); + return errorCode; + } + + hService = OpenService(hManager, argv[2], SERVICE_PAUSE_CONTINUE); + + if(hService == NULL) + { + printf("[OpenService] Error: %d\n", errorCode=GetLastError()); + CloseServiceHandle(hManager); + return errorCode; + } + + if(!ControlService(hService, SERVICE_CONTROL_CONTINUE, &status)) + { + printf("[ControlService] Error: %d\n", errorCode=GetLastError()); + } + + CloseServiceHandle(hService); + CloseServiceHandle(hManager); + + return errorCode; +} + +/* EOF */ + Propchange: trunk/reactos/base/applications/network/net/cmdContinue.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/cmdHelpMsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdHelpMsg.c (added) +++ trunk/reactos/base/applications/network/net/cmdHelpMsg.c [iso-8859-1] Tue Apr 30 02:57:30 2013 @@ -1,0 +1,47 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: cmdHelpmsg.c + * PURPOSE: + * + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#include "net.h" +#include "stdlib.h" + +int cmdHelpMsg(int argc, wchar_t *argv[]) +{ + wchar_t *endptr; + LPSTR lpBuffer; + if(argc<3) + { + puts("Usage: NET HELPMSG <Error Code>"); + return 1; + } + long errNum=wcstol(argv[2], &endptr, 10); + if(*endptr != 0) + { + puts("Usage: NET HELPMSG <Error Code>"); + return 1; + } + + /* Unicode printing is not supported in ReactOS yet */ + if(FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + errNum, + LANG_USER_DEFAULT, + (LPSTR)&lpBuffer, + 0, + NULL)) + { + printf("\n%s\n", lpBuffer); + LocalFree(lpBuffer); + } + else printf("Unrecognized error code: %ld\n", errNum); + + return 0; +} + +/* EOF */ + Propchange: trunk/reactos/base/applications/network/net/cmdHelpMsg.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/cmdPause.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdPause.c (added) +++ trunk/reactos/base/applications/network/net/cmdPause.c [iso-8859-1] Tue Apr 30 02:57:30 2013 @@ -1,0 +1,50 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: cmdPause.c + * PURPOSE: + * + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#include "net.h" + +int cmdPause(int argc, wchar_t *argv[]) +{ + int errorCode=0; + SC_HANDLE hManager, hService; + SERVICE_STATUS status; + if(argc != 3) + { + puts("Usage: NET PAUSE <Service Name>"); + return 1; + } + + hManager = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ENUMERATE_SERVICE); + if(hManager == NULL) + { + printf("[OpenSCManager] Error: %d\n", errorCode=GetLastError()); + return errorCode; + } + + hService=OpenService(hManager, argv[2], SERVICE_PAUSE_CONTINUE); + if(hService == NULL) + { + printf("[OpenService] Error: %d\n", errorCode=GetLastError()); + CloseServiceHandle(hManager); + return errorCode; + } + + if(!ControlService(hService, SERVICE_CONTROL_PAUSE, &status)) + { + printf("[ControlService] Error: %d\n", errorCode=GetLastError()); + } + + CloseServiceHandle(hService); + CloseServiceHandle(hManager); + + return errorCode; +} + +/* EOF */ + Propchange: trunk/reactos/base/applications/network/net/cmdPause.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/net/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/help.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/help.c [iso-8859-1] Tue Apr 30 02:57:30 2013 @@ -11,7 +11,7 @@ INT cmdHelp(INT argc, WCHAR **argv) { - if (argc > 3) + if (argc != 3) { return 0; } Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Tue Apr 30 02:57:30 2013 @@ -21,14 +21,15 @@ {L"accounts", unimplemented}, {L"computer", unimplemented}, {L"config", unimplemented}, - {L"continue", unimplemented}, + {L"continue", cmdContinue}, {L"file", unimplemented}, {L"group", unimplemented}, {L"help", cmdHelp}, - {L"helpmsg", unimplemented}, + {L"helpmsg", cmdHelpMsg}, {L"localgroup", unimplemented}, {L"name", unimplemented}, {L"print", unimplemented}, + {L"pause", cmdPause}, {L"send", unimplemented}, {L"session", unimplemented}, {L"share", unimplemented}, @@ -39,7 +40,7 @@ {L"use", unimplemented}, {L"user", unimplemented}, {L"view", unimplemented}, - + {NULL, NULL} }; int wmain(int argc, WCHAR **argv) Modified: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Tue Apr 30 02:57:30 2013 @@ -19,3 +19,6 @@ INT cmdHelp(INT argc, WCHAR **argv); INT cmdStart(INT argc, WCHAR **argv); INT cmdStop(INT argc, WCHAR **argv); +int cmdHelpMsg(int argc, wchar_t *argv[]); +int cmdPause(int argc, wchar_t *argv[]); +int cmdContinue(int argc, wchar_t *argv[]);

11 years, 4 months

[hbelusca] 58893: [HOSTNAME] Unicodify and add localization support. Patch by Lee Schroeder, simplified by me. CORE-7142 #resolve #comment Committed in revision r58893, thanks! [REGEDIT] "Neutraliz...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Apr 29 23:49:52 2013 New Revision: 58893 URL: http://svn.reactos.org/svn/reactos?rev=58893&view=rev Log: [HOSTNAME] Unicodify and add localization support. Patch by Lee Schroeder, simplified by me. CORE-7142 #resolve #comment Committed in revision r58893, thanks! [REGEDIT] "Neutralize" common resources. Added: trunk/reactos/base/applications/cmdutils/hostname/lang/ (with props) trunk/reactos/base/applications/cmdutils/hostname/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/hostname/lang/fr-FR.rc (with props) trunk/reactos/base/applications/cmdutils/hostname/resource.h (with props) trunk/reactos/base/applications/cmdutils/hostname/rsrc.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/hostname/CMakeLists.txt trunk/reactos/base/applications/cmdutils/hostname/hostname.c trunk/reactos/base/applications/cmdutils/hostname/hostname.rc trunk/reactos/base/applications/regedit/regedit.rc Modified: trunk/reactos/base/applications/cmdutils/hostname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] Mon Apr 29 23:49:52 2013 @@ -1,6 +1,6 @@ add_executable(hostname hostname.c hostname.rc) -set_module_type(hostname win32cui) -add_importlibs(hostname msvcrt kernel32) +set_module_type(hostname win32cui UNICODE) +add_importlibs(hostname user32 msvcrt kernel32) add_cd_file(TARGET hostname DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/hostname/hostname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/hostname.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/hostname/hostname.c [iso-8859-1] Mon Apr 29 23:49:52 2013 @@ -23,38 +23,52 @@ * PROGRAMMER: Emanuele Aliberti (ea(a)reactos.com) */ -#include <stdio.h> -#include <stdlib.h> -//#include <string.h> +#include <conio.h> #include <windef.h> #include <winbase.h> +#include <winuser.h> -int main (int argc, char ** argv) +#include "resource.h" + +int wmain(int argc, WCHAR* argv[]) { - if (1 == argc) - { - TCHAR ComputerName [MAX_COMPUTERNAME_LENGTH + 1]; - DWORD ComputerNameSize = sizeof ComputerName / sizeof ComputerName[0]; + WCHAR Msg[100]; - ZeroMemory (ComputerName, sizeof ComputerName ); - if (GetComputerName(ComputerName, & ComputerNameSize)) - { - printf ("%s\n", ComputerName); - return EXIT_SUCCESS; - } - fprintf (stderr, "%s: Win32 error %lu.\n", - argv[0], GetLastError()); - return EXIT_FAILURE; - }else{ - if (0 == strcmp(argv[1],"-s")) - { - fprintf(stderr,"%s: -s not supported.\n",argv[0]); - return EXIT_FAILURE; - }else{ - printf("Print the current host's name.\n\nhostname\n"); - } - } - return EXIT_SUCCESS; + if (1 == argc) + { + WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1] = L""; + DWORD ComputerNameSize = sizeof(ComputerName) / sizeof(ComputerName[0]); + + if (!GetComputerName(ComputerName, &ComputerNameSize)) + { + /* Fail in case of error */ + LoadStringW(GetModuleHandle(NULL), IDS_ERROR, Msg, 100); + _cwprintf(L"%s %lu.\n", Msg, GetLastError()); + return 1; + } + + /* Print out the computer's name */ + _cwprintf(L"%s\n", ComputerName); + } + else + { + if ((wcsicmp(argv[1], L"-s") == 0) || (wcsicmp(argv[1], L"/s") == 0)) + { + /* The program doesn't allow the user to set the computer's name */ + LoadStringW(GetModuleHandle(NULL), IDS_NOSET, Msg, 100); + _cwprintf(L"%s\n", Msg); + return 1; + } + else + { + /* Let the user know what the program does */ + LoadStringW(GetModuleHandle(NULL), IDS_USAGE, Msg, 100); + _cwprintf(L"\n%s\n\n", Msg); + } + } + + return 0; } + /* EOF */ Modified: trunk/reactos/base/applications/cmdutils/hostname/hostname.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/hostname.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/hostname/hostname.rc [iso-8859-1] Mon Apr 29 23:49:52 2013 @@ -1,4 +1,12 @@ -#define REACTOS_STR_FILE_DESCRIPTION "Win32 Get local host name\0" -#define REACTOS_STR_INTERNAL_NAME "hostname\0" -#define REACTOS_STR_ORIGINAL_FILENAME "hostname.exe\0" +#include <windef.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "Host name application" +#define REACTOS_STR_INTERNAL_NAME "hostname" +#define REACTOS_STR_ORIGINAL_FILENAME "hostname.exe" #include <reactos/version.rc> + +#include "rsrc.rc" Propchange: trunk/reactos/base/applications/cmdutils/hostname/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Apr 29 23:49:52 2013 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/cmdutils/hostname/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/hostname/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/hostname/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/hostname/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/hostname/lang/en-US.rc [iso-8859-1] Mon Apr 29 23:49:52 2013 @@ -1,0 +1,8 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_USAGE, "Print the current host's name.\n\nhostname" + IDS_NOSET, "hostname -s is not supported." + IDS_ERROR, "Win32 error" +END Propchange: trunk/reactos/base/applications/cmdutils/hostname/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/hostname/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/cmdutils/hostname/lang/fr-FR.rc [iso-8859-1] Mon Apr 29 23:49:52 2013 @@ -1,0 +1,8 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_USAGE, "Affiche le nom de l'hÃ´te actuel.\n\nhostname" + IDS_NOSET, "hostname -s n'est pas pris en charge." + IDS_ERROR, "Erreur Win32" +END Propchange: trunk/reactos/base/applications/cmdutils/hostname/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/hostname/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/hostname/resource.h [iso-8859-1] Mon Apr 29 23:49:52 2013 @@ -1,0 +1,8 @@ +#ifndef RESOURCE_H +#define RESOURCE_H + +#define IDS_USAGE 0 +#define IDS_NOSET 1 +#define IDS_ERROR 2 + +#endif /* RESOURCE_H */ Propchange: trunk/reactos/base/applications/cmdutils/hostname/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/hostname/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/rsrc.rc (added) +++ trunk/reactos/base/applications/cmdutils/hostname/rsrc.rc [iso-8859-1] Mon Apr 29 23:49:52 2013 @@ -1,0 +1,11 @@ +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +// UTF-8 +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif Propchange: trunk/reactos/base/applications/cmdutils/hostname/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/regedit/regedit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.rc [iso-8859-1] Mon Apr 29 23:49:52 2013 @@ -24,12 +24,12 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Registry Explorer\0" -#define REACTOS_STR_INTERNAL_NAME "regedit\0" -#define REACTOS_STR_ORIGINAL_FILENAME "regedit.exe\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Registry Explorer" +#define REACTOS_STR_INTERNAL_NAME "regedit" +#define REACTOS_STR_ORIGINAL_FILENAME "regedit.exe" #include <reactos/version.rc> -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "rsrc.rc"

11 years, 4 months

[jgardou] 58892: [NTOSKRNL/V86VDM] - Merge the EFLAGS register instead of overwriting it when restoring it from a POPF call.

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Apr 29 16:17:46 2013 New Revision: 58892 URL: http://svn.reactos.org/svn/reactos?rev=58892&view=rev Log: [NTOSKRNL/V86VDM] - Merge the EFLAGS register instead of overwriting it when restoring it from a POPF call. Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Mon Apr 29 16:17:46 2013 @@ -155,7 +155,7 @@ V86EFlags |= EFLAGS_V86_MASK; /* Update EFlags in trap frame */ - TrapFrame->EFlags = V86EFlags; + TrapFrame->EFlags |= V86EFlags; /* Check if ESP0 needs to be fixed up */ if (TrapEFlags & EFLAGS_V86_MASK) Ki386AdjustEsp0(TrapFrame);

11 years, 4 months

[akhaldi] 58891: [LWIP] * Update to 1.4.1. Brought to you by Samuel Serapion. CORE-7140

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 29 12:24:39 2013 New Revision: 58891 URL: http://svn.reactos.org/svn/reactos?rev=58891&view=rev Log: [LWIP] * Update to 1.4.1. Brought to you by Samuel Serapion. CORE-7140 Removed: trunk/reactos/lib/drivers/lwip/src/netif/loopif.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/vjbsdhdr.h Modified: trunk/reactos/lib/drivers/lwip/CHANGELOG trunk/reactos/lib/drivers/lwip/doc/contrib.txt trunk/reactos/lib/drivers/lwip/doc/rawapi.txt trunk/reactos/lib/drivers/lwip/doc/savannah.txt trunk/reactos/lib/drivers/lwip/doc/sys_arch.txt trunk/reactos/lib/drivers/lwip/src/api/api_lib.c trunk/reactos/lib/drivers/lwip/src/api/api_msg.c trunk/reactos/lib/drivers/lwip/src/api/netdb.c trunk/reactos/lib/drivers/lwip/src/api/sockets.c trunk/reactos/lib/drivers/lwip/src/api/tcpip.c trunk/reactos/lib/drivers/lwip/src/core/dhcp.c trunk/reactos/lib/drivers/lwip/src/core/init.c trunk/reactos/lib/drivers/lwip/src/core/ipv4/autoip.c trunk/reactos/lib/drivers/lwip/src/core/ipv4/icmp.c trunk/reactos/lib/drivers/lwip/src/core/ipv4/igmp.c trunk/reactos/lib/drivers/lwip/src/core/ipv4/ip.c trunk/reactos/lib/drivers/lwip/src/core/ipv6/ip6.c trunk/reactos/lib/drivers/lwip/src/core/mem.c trunk/reactos/lib/drivers/lwip/src/core/memp.c trunk/reactos/lib/drivers/lwip/src/core/netif.c trunk/reactos/lib/drivers/lwip/src/core/pbuf.c trunk/reactos/lib/drivers/lwip/src/core/raw.c trunk/reactos/lib/drivers/lwip/src/core/snmp/mib2.c trunk/reactos/lib/drivers/lwip/src/core/snmp/msg_in.c trunk/reactos/lib/drivers/lwip/src/core/snmp/msg_out.c trunk/reactos/lib/drivers/lwip/src/core/stats.c trunk/reactos/lib/drivers/lwip/src/core/sys.c trunk/reactos/lib/drivers/lwip/src/core/tcp.c trunk/reactos/lib/drivers/lwip/src/core/tcp_in.c trunk/reactos/lib/drivers/lwip/src/core/tcp_out.c trunk/reactos/lib/drivers/lwip/src/core/timers.c trunk/reactos/lib/drivers/lwip/src/core/udp.c trunk/reactos/lib/drivers/lwip/src/include/ipv4/lwip/autoip.h trunk/reactos/lib/drivers/lwip/src/include/ipv4/lwip/ip.h trunk/reactos/lib/drivers/lwip/src/include/lwip/api.h trunk/reactos/lib/drivers/lwip/src/include/lwip/api_msg.h trunk/reactos/lib/drivers/lwip/src/include/lwip/arch.h trunk/reactos/lib/drivers/lwip/src/include/lwip/debug.h trunk/reactos/lib/drivers/lwip/src/include/lwip/def.h trunk/reactos/lib/drivers/lwip/src/include/lwip/init.h trunk/reactos/lib/drivers/lwip/src/include/lwip/mem.h trunk/reactos/lib/drivers/lwip/src/include/lwip/memp_std.h trunk/reactos/lib/drivers/lwip/src/include/lwip/netif.h trunk/reactos/lib/drivers/lwip/src/include/lwip/opt.h trunk/reactos/lib/drivers/lwip/src/include/lwip/pbuf.h trunk/reactos/lib/drivers/lwip/src/include/lwip/sockets.h trunk/reactos/lib/drivers/lwip/src/include/lwip/stats.h trunk/reactos/lib/drivers/lwip/src/include/lwip/sys.h trunk/reactos/lib/drivers/lwip/src/include/lwip/tcp.h trunk/reactos/lib/drivers/lwip/src/include/lwip/tcp_impl.h trunk/reactos/lib/drivers/lwip/src/include/lwip/tcpip.h trunk/reactos/lib/drivers/lwip/src/include/lwip/timers.h trunk/reactos/lib/drivers/lwip/src/include/lwip/udp.h trunk/reactos/lib/drivers/lwip/src/include/netif/etharp.h trunk/reactos/lib/drivers/lwip/src/include/netif/slipif.h trunk/reactos/lib/drivers/lwip/src/netif/etharp.c trunk/reactos/lib/drivers/lwip/src/netif/ethernetif.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/auth.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/chap.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/chpms.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/fsm.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/ipcp.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/lcp.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/magic.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/md5.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/pap.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/ppp.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/ppp.h trunk/reactos/lib/drivers/lwip/src/netif/ppp/ppp_oe.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/randm.c trunk/reactos/lib/drivers/lwip/src/netif/ppp/vj.c trunk/reactos/lib/drivers/lwip/src/netif/slipif.c trunk/reactos/lib/drivers/lwip/src/rosip.c trunk/reactos/lib/drivers/lwip/src/rostcp.c trunk/reactos/lib/drivers/lwip/test/unit/lwip_unittests.c trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.c trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.h trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp.c trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/drivers/lwip/CHANGELOG URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/CHANGELOG… Modified: trunk/reactos/lib/drivers/lwip/doc/contrib.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/doc/contr… Modified: trunk/reactos/lib/drivers/lwip/doc/rawapi.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/doc/rawap… Modified: trunk/reactos/lib/drivers/lwip/doc/savannah.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/doc/savan… Modified: trunk/reactos/lib/drivers/lwip/doc/sys_arch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/doc/sys_a… Modified: trunk/reactos/lib/drivers/lwip/src/api/api_lib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/api/a… Modified: trunk/reactos/lib/drivers/lwip/src/api/api_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/api/a… Modified: trunk/reactos/lib/drivers/lwip/src/api/netdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/api/n… Modified: trunk/reactos/lib/drivers/lwip/src/api/sockets.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/api/s… Modified: trunk/reactos/lib/drivers/lwip/src/api/tcpip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/api/t… Modified: trunk/reactos/lib/drivers/lwip/src/core/dhcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/ipv4/autoip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/ipv4/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/ipv4/igmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/ipv4/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/ipv6/ip6.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/memp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/netif.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/pbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/raw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/snmp/mib2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/snmp/msg_in.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/snmp/msg_out.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/stats.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/sys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/tcp_in.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/tcp_out.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/timers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/core/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/core/… Modified: trunk/reactos/lib/drivers/lwip/src/include/ipv4/lwip/autoip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/ipv4/lwip/ip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/api_msg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/arch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/def.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/init.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/mem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/memp_std.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/netif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/opt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/pbuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/sockets.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/stats.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/sys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/tcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/tcp_impl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/timers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/lwip/udp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/netif/etharp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/include/netif/slipif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… Modified: trunk/reactos/lib/drivers/lwip/src/netif/etharp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ethernetif.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Removed: trunk/reactos/lib/drivers/lwip/src/netif/loopif.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/auth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/chap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/chpms.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/fsm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/ipcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/lcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/magic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/md5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/pap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/ppp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/ppp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/ppp_oe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/randm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/ppp/vj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Removed: trunk/reactos/lib/drivers/lwip/src/netif/ppp/vjbsdhdr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/netif/slipif.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/netif… Modified: trunk/reactos/lib/drivers/lwip/src/rosip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rosip… Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… Modified: trunk/reactos/lib/drivers/lwip/test/unit/lwip_unittests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… Modified: trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… Modified: trunk/reactos/lib/drivers/lwip/test/unit/tcp/tcp_helper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… Modified: trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit… Modified: trunk/reactos/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/test/unit…

11 years, 4 months

[fireball] 58890: [FSRTL] - Reformat the code for better readability. Sacrifice 80 chars max line width in favor of a readable code (sorry, but when the indentation eats 12 chars, formulas for calc...

by fireball＠svn.reactos.org

Author: fireball Date: Mon Apr 29 10:28:58 2013 New Revision: 58890 URL: http://svn.reactos.org/svn/reactos?rev=58890&view=rev Log: [FSRTL] - Reformat the code for better readability. Sacrifice 80 chars max line width in favor of a readable code (sorry, but when the indentation eats 12 chars, formulas for calculating sizes are hard to fit into less than 70 chars, and they become totally unreadable). Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Mon Apr 29 10:28:58 2013 @@ -21,10 +21,10 @@ typedef struct _LARGE_MCB_MAPPING_ENTRY { - LARGE_INTEGER RunStartVbn; - LARGE_INTEGER SectorCount; - LARGE_INTEGER StartingLbn; - LIST_ENTRY Sequence; + LARGE_INTEGER RunStartVbn; + LARGE_INTEGER SectorCount; + LARGE_INTEGER StartingLbn; + LIST_ENTRY Sequence; } LARGE_MCB_MAPPING_ENTRY, *PLARGE_MCB_MAPPING_ENTRY; typedef struct _LARGE_MCB_MAPPING @@ -44,29 +44,27 @@ static PVOID NTAPI McbMappingAllocate(PRTL_GENERIC_TABLE Table, CLONG Bytes) { - PVOID Result; - PBASE_MCB Mcb = (PBASE_MCB)Table->TableContext; - Result = ExAllocatePoolWithTag(Mcb->PoolType, Bytes, 'LMCB'); - DPRINT("McbMappingAllocate(%d) => %p\n", Bytes, Result); - return Result; + PVOID Result; + PBASE_MCB Mcb = (PBASE_MCB)Table->TableContext; + Result = ExAllocatePoolWithTag(Mcb->PoolType, Bytes, 'LMCB'); + DPRINT("McbMappingAllocate(%d) => %p\n", Bytes, Result); + return Result; } static VOID NTAPI McbMappingFree(PRTL_GENERIC_TABLE Table, PVOID Buffer) { - DPRINT("McbMappingFree(%p)\n", Buffer); - ExFreePoolWithTag(Buffer, 'LMCB'); + DPRINT("McbMappingFree(%p)\n", Buffer); + ExFreePoolWithTag(Buffer, 'LMCB'); } static RTL_GENERIC_COMPARE_RESULTS NTAPI McbMappingCompare (RTL_GENERIC_TABLE Table, PVOID PtrA, PVOID PtrB) { - PLARGE_MCB_MAPPING_ENTRY A = PtrA, B = PtrB; - return - (A->RunStartVbn.QuadPart + A->SectorCount.QuadPart < - B->RunStartVbn.QuadPart) ? GenericLessThan : - (A->RunStartVbn.QuadPart > - B->RunStartVbn.QuadPart + B->SectorCount.QuadPart) ? - GenericGreaterThan : GenericEqual; + PLARGE_MCB_MAPPING_ENTRY A = PtrA, B = PtrB; + + return + (A->RunStartVbn.QuadPart + A->SectorCount.QuadPart < B->RunStartVbn.QuadPart) ? GenericLessThan : + (A->RunStartVbn.QuadPart > B->RunStartVbn.QuadPart + B->SectorCount.QuadPart) ? GenericGreaterThan : GenericEqual; } /* PUBLIC FUNCTIONS **********************************************************/ @@ -82,66 +80,64 @@ IN LONGLONG SectorCount) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - LARGE_MCB_MAPPING_ENTRY Node; - PLARGE_MCB_MAPPING_ENTRY Existing = NULL; - BOOLEAN NewElement = FALSE; - - Node.RunStartVbn.QuadPart = Vbn; - Node.StartingLbn.QuadPart = Lbn; - Node.SectorCount.QuadPart = SectorCount; - - while (!NewElement) - { - DPRINT("Inserting %x:%x\n", Node.RunStartVbn.LowPart, Node.SectorCount.LowPart); - Existing = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Node, sizeof(Node), &NewElement); - DPRINT("Existing %x\n", Existing); - if (!Existing) break; - - DPRINT("NewElement %d\n", NewElement); - if (!NewElement) - { - // We merge the existing runs - LARGE_INTEGER StartVbn, FinalVbn; - DPRINT("Existing: %x:%x\n", Existing->RunStartVbn.LowPart, Node.SectorCount.LowPart); - if (Existing->RunStartVbn.QuadPart < Node.RunStartVbn.QuadPart) - { - StartVbn = Existing->RunStartVbn; - Node.StartingLbn = Existing->StartingLbn; - } - else - { - StartVbn = Node.RunStartVbn; - } - DPRINT("StartVbn %x\n", StartVbn.LowPart); - if (Existing->RunStartVbn.QuadPart + Existing->SectorCount.QuadPart > - Node.RunStartVbn.QuadPart + Node.SectorCount.QuadPart) - { - FinalVbn.QuadPart = - Existing->RunStartVbn.QuadPart + Existing->SectorCount.QuadPart; - } - else - { - FinalVbn.QuadPart = - Node.RunStartVbn.QuadPart + Node.SectorCount.QuadPart; - } - DPRINT("FinalVbn %x\n", FinalVbn.LowPart); - Node.RunStartVbn.QuadPart = StartVbn.QuadPart; - Node.SectorCount.QuadPart = FinalVbn.QuadPart - StartVbn.QuadPart; - RemoveHeadList(&Existing->Sequence); - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Existing); - Mcb->PairCount--; - } - else - { - DPRINT("Mapping added %x\n", Existing); - Mcb->MaximumPairCount++; - Mcb->PairCount++; - InsertHeadList(&Mcb->Mapping->SequenceList, &Existing->Sequence); - } - } - - DPRINT("!!Existing %d\n", !!Existing); - return !!Existing; + LARGE_MCB_MAPPING_ENTRY Node; + PLARGE_MCB_MAPPING_ENTRY Existing = NULL; + BOOLEAN NewElement = FALSE; + + Node.RunStartVbn.QuadPart = Vbn; + Node.StartingLbn.QuadPart = Lbn; + Node.SectorCount.QuadPart = SectorCount; + + while (!NewElement) + { + DPRINT("Inserting %x:%x\n", Node.RunStartVbn.LowPart, Node.SectorCount.LowPart); + Existing = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Node, sizeof(Node), &NewElement); + DPRINT("Existing %x\n", Existing); + if (!Existing) break; + + DPRINT("NewElement %d\n", NewElement); + if (!NewElement) + { + // We merge the existing runs + LARGE_INTEGER StartVbn, FinalVbn; + DPRINT("Existing: %x:%x\n", Existing->RunStartVbn.LowPart, Node.SectorCount.LowPart); + if (Existing->RunStartVbn.QuadPart < Node.RunStartVbn.QuadPart) + { + StartVbn = Existing->RunStartVbn; + Node.StartingLbn = Existing->StartingLbn; + } + else + { + StartVbn = Node.RunStartVbn; + } + DPRINT("StartVbn %x\n", StartVbn.LowPart); + if (Existing->RunStartVbn.QuadPart + Existing->SectorCount.QuadPart > + Node.RunStartVbn.QuadPart + Node.SectorCount.QuadPart) + { + FinalVbn.QuadPart = Existing->RunStartVbn.QuadPart + Existing->SectorCount.QuadPart; + } + else + { + FinalVbn.QuadPart = Node.RunStartVbn.QuadPart + Node.SectorCount.QuadPart; + } + DPRINT("FinalVbn %x\n", FinalVbn.LowPart); + Node.RunStartVbn.QuadPart = StartVbn.QuadPart; + Node.SectorCount.QuadPart = FinalVbn.QuadPart - StartVbn.QuadPart; + RemoveHeadList(&Existing->Sequence); + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Existing); + Mcb->PairCount--; + } + else + { + DPRINT("Mapping added %x\n", Existing); + Mcb->MaximumPairCount++; + Mcb->PairCount++; + InsertHeadList(&Mcb->Mapping->SequenceList, &Existing->Sequence); + } + } + + DPRINT("!!Existing %d\n", !!Existing); + return !!Existing; } /* @@ -156,7 +152,7 @@ { BOOLEAN Result; - DPRINT("Mcb %x Vbn %x Lbn %x SectorCount %x\n", Mcb, Vbn, Lbn, SectorCount); + DPRINT("Mcb %x Vbn %x Lbn %x SectorCount %x\n", Mcb, Vbn, Lbn, SectorCount); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlAddBaseMcbEntry(&(Mcb->BaseMcb), @@ -165,7 +161,7 @@ SectorCount); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %d\n", Result); + DPRINT("Done %d\n", Result); return Result; } @@ -182,26 +178,26 @@ OUT PLONGLONG SectorCount) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - ULONG i = 0; - BOOLEAN Result = FALSE; - PLARGE_MCB_MAPPING_ENTRY Entry; - for (Entry = (PLARGE_MCB_MAPPING_ENTRY) - RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); - Entry && i < RunIndex; - Entry = (PLARGE_MCB_MAPPING_ENTRY) - RtlEnumerateGenericTable(&Mcb->Mapping->Table, FALSE), i++); - if (Entry) - { - Result = TRUE; - if (Vbn) - *Vbn = Entry->RunStartVbn.QuadPart; - if (Lbn) - *Lbn = Entry->StartingLbn.QuadPart; - if (SectorCount) - *SectorCount = Entry->SectorCount.QuadPart; - } - - return Result; + ULONG i = 0; + BOOLEAN Result = FALSE; + PLARGE_MCB_MAPPING_ENTRY Entry; + + for (Entry = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); + Entry && (i < RunIndex); + Entry = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, FALSE), i++); + + if (Entry) + { + Result = TRUE; + if (Vbn) + *Vbn = Entry->RunStartVbn.QuadPart; + if (Lbn) + *Lbn = Entry->StartingLbn.QuadPart; + if (SectorCount) + *SectorCount = Entry->SectorCount.QuadPart; + } + + return Result; } /* @@ -217,7 +213,7 @@ { BOOLEAN Result; - DPRINT("FsRtlGetNextLargeMcbEntry Mcb %x RunIndex %x\n", Mcb, RunIndex); + DPRINT("FsRtlGetNextLargeMcbEntry Mcb %x RunIndex %x\n", Mcb, RunIndex); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlGetNextBaseMcbEntry(&(Mcb->BaseMcb), @@ -227,7 +223,7 @@ SectorCount); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %d\n", Result); + DPRINT("Done %d\n", Result); return Result; } @@ -250,19 +246,18 @@ else { Mcb->Mapping = ExAllocatePoolWithTag(PoolType | POOL_RAISE_IF_ALLOCATION_FAILURE, - sizeof(LARGE_MCB_MAPPING), + sizeof(LARGE_MCB_MAPPING), 'FSBC'); } Mcb->PoolType = PoolType; Mcb->MaximumPairCount = MAXIMUM_PAIR_COUNT; - RtlInitializeGenericTable - (&Mcb->Mapping->Table, - (PRTL_GENERIC_COMPARE_ROUTINE)McbMappingCompare, - McbMappingAllocate, - McbMappingFree, - Mcb); - InitializeListHead(&Mcb->Mapping->SequenceList); + RtlInitializeGenericTable(&Mcb->Mapping->Table, + (PRTL_GENERIC_COMPARE_ROUTINE)McbMappingCompare, + McbMappingAllocate, + McbMappingFree, + Mcb); + InitializeListHead(&Mcb->Mapping->SequenceList); } /* @@ -302,7 +297,7 @@ NULL, NULL, POOL_RAISE_IF_ALLOCATION_FAILURE, - sizeof(LARGE_MCB_MAPPING), + sizeof(LARGE_MCB_MAPPING), IFS_POOL_TAG, 0); /* FIXME: Should be 4 */ @@ -330,43 +325,43 @@ OUT PULONG Index OPTIONAL) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - BOOLEAN Result = FALSE; - LARGE_MCB_MAPPING_ENTRY ToLookup; - PLARGE_MCB_MAPPING_ENTRY Entry; - - ToLookup.RunStartVbn.QuadPart = Vbn; - ToLookup.SectorCount.QuadPart = 1; - - Entry = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &ToLookup); + BOOLEAN Result = FALSE; + LARGE_MCB_MAPPING_ENTRY ToLookup; + PLARGE_MCB_MAPPING_ENTRY Entry; + + ToLookup.RunStartVbn.QuadPart = Vbn; + ToLookup.SectorCount.QuadPart = 1; + + Entry = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &ToLookup); DPRINT("Entry %p\n", Entry); - if (!Entry) - { - // Find out if we have a following entry. The spec says we should return - // found with Lbn == -1 when we're beneath the largest map. - ToLookup.SectorCount.QuadPart = (1ull<<62) - ToLookup.RunStartVbn.QuadPart; - Entry = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &ToLookup); + if (!Entry) + { + // Find out if we have a following entry. The spec says we should return + // found with Lbn == -1 when we're beneath the largest map. + ToLookup.SectorCount.QuadPart = (1ull<<62) - ToLookup.RunStartVbn.QuadPart; + Entry = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &ToLookup); DPRINT("Entry %p\n", Entry); - if (Entry) - { - Result = TRUE; - if (Lbn) *Lbn = ~0ull; - } - else - { - Result = FALSE; - } - } - else - { - LARGE_INTEGER Offset; - Offset.QuadPart = Vbn - Entry->RunStartVbn.QuadPart; - Result = TRUE; - if (Lbn) *Lbn = Entry->StartingLbn.QuadPart + Offset.QuadPart; - if (SectorCountFromLbn) *SectorCountFromLbn = Entry->SectorCount.QuadPart - Offset.QuadPart; - if (StartingLbn) *StartingLbn = Entry->StartingLbn.QuadPart; - if (SectorCountFromStartingLbn) *SectorCountFromStartingLbn = Entry->SectorCount.QuadPart; - } - DPRINT("Done\n"); + if (Entry) + { + Result = TRUE; + if (Lbn) *Lbn = ~0ull; + } + else + { + Result = FALSE; + } + } + else + { + LARGE_INTEGER Offset; + Offset.QuadPart = Vbn - Entry->RunStartVbn.QuadPart; + Result = TRUE; + if (Lbn) *Lbn = Entry->StartingLbn.QuadPart + Offset.QuadPart; + if (SectorCountFromLbn) *SectorCountFromLbn = Entry->SectorCount.QuadPart - Offset.QuadPart; + if (StartingLbn) *StartingLbn = Entry->StartingLbn.QuadPart; + if (SectorCountFromStartingLbn) *SectorCountFromStartingLbn = Entry->SectorCount.QuadPart; + } + DPRINT("Done\n"); return Result; } @@ -385,7 +380,7 @@ { BOOLEAN Result; - DPRINT("FsRtlLookupLargeMcbEntry Mcb %x Vbn %x\n", Mcb, (ULONG)Vbn); + DPRINT("FsRtlLookupLargeMcbEntry Mcb %x Vbn %x\n", Mcb, (ULONG)Vbn); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlLookupBaseMcbEntry(&(Mcb->BaseMcb), @@ -397,7 +392,7 @@ Index); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %d\n", Result); + DPRINT("Done %d\n", Result); return Result; } @@ -413,28 +408,28 @@ IN OUT PULONG Index) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - ULONG i = 0; - BOOLEAN Result = FALSE; - PLIST_ENTRY ListEntry; - PLARGE_MCB_MAPPING_ENTRY Entry; - PLARGE_MCB_MAPPING_ENTRY CountEntry; - - ListEntry = &Mcb->Mapping->SequenceList; - if (!IsListEmpty(ListEntry)) - { - Entry = CONTAINING_RECORD(ListEntry->Flink, LARGE_MCB_MAPPING_ENTRY, Sequence); - Result = TRUE; - *LargeVbn = Entry->RunStartVbn.QuadPart; - *LargeLbn = Entry->StartingLbn.QuadPart; - - for (i = 0, CountEntry = RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); - CountEntry != Entry; - CountEntry = RtlEnumerateGenericTable(&Mcb->Mapping->Table, FALSE)); + ULONG i = 0; + BOOLEAN Result = FALSE; + PLIST_ENTRY ListEntry; + PLARGE_MCB_MAPPING_ENTRY Entry; + PLARGE_MCB_MAPPING_ENTRY CountEntry; + + ListEntry = &Mcb->Mapping->SequenceList; + if (!IsListEmpty(ListEntry)) + { + Entry = CONTAINING_RECORD(ListEntry->Flink, LARGE_MCB_MAPPING_ENTRY, Sequence); + Result = TRUE; + *LargeVbn = Entry->RunStartVbn.QuadPart; + *LargeLbn = Entry->StartingLbn.QuadPart; + + for (i = 0, CountEntry = RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); + CountEntry != Entry; + CountEntry = RtlEnumerateGenericTable(&Mcb->Mapping->Table, FALSE)); DPRINT1("Most probably we are returning shit now\n"); - *Index = i; - } - - return Result; + *Index = i; + } + + return Result; } /* @@ -449,7 +444,7 @@ { BOOLEAN Result; - DPRINT("FsRtlLookupLastLargeMcbEntryAndIndex %x\n", OpaqueMcb); + DPRINT("FsRtlLookupLastLargeMcbEntryAndIndex %x\n", OpaqueMcb); KeAcquireGuardedMutex(OpaqueMcb->GuardedMutex); Result = FsRtlLookupLastBaseMcbEntryAndIndex(&(OpaqueMcb->BaseMcb), @@ -458,7 +453,7 @@ Index); KeReleaseGuardedMutex(OpaqueMcb->GuardedMutex); - DPRINT("Done %d\n", Result); + DPRINT("Done %d\n", Result); return Result; } @@ -473,20 +468,20 @@ OUT PLONGLONG Lbn) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - BOOLEAN Result = FALSE; - PLIST_ENTRY ListEntry; - PLARGE_MCB_MAPPING_ENTRY Entry; - - ListEntry = &Mcb->Mapping->SequenceList; - if (!IsListEmpty(ListEntry)) - { - Entry = CONTAINING_RECORD(ListEntry->Flink, LARGE_MCB_MAPPING_ENTRY, Sequence); - Result = TRUE; - *Vbn = Entry->RunStartVbn.QuadPart; - *Lbn = Entry->StartingLbn.QuadPart; - } - - return Result; + BOOLEAN Result = FALSE; + PLIST_ENTRY ListEntry; + PLARGE_MCB_MAPPING_ENTRY Entry; + + ListEntry = &Mcb->Mapping->SequenceList; + if (!IsListEmpty(ListEntry)) + { + Entry = CONTAINING_RECORD(ListEntry->Flink, LARGE_MCB_MAPPING_ENTRY, Sequence); + Result = TRUE; + *Vbn = Entry->RunStartVbn.QuadPart; + *Lbn = Entry->StartingLbn.QuadPart; + } + + return Result; } /* @@ -500,7 +495,7 @@ { BOOLEAN Result; - DPRINT("FsRtlLookupLastLargeMcbEntry Mcb %x\n", Mcb); + DPRINT("FsRtlLookupLastLargeMcbEntry Mcb %x\n", Mcb); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlLookupLastBaseMcbEntry(&(Mcb->BaseMcb), @@ -508,7 +503,7 @@ Lbn); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %d\n", Result); + DPRINT("Done %d\n", Result); return Result; } @@ -533,14 +528,14 @@ { ULONG NumberOfRuns; - DPRINT("FsRtlNumberOfRunsInLargeMcb Mcb %x\n", Mcb); + DPRINT("FsRtlNumberOfRunsInLargeMcb Mcb %x\n", Mcb); /* Read the number of runs while holding the MCB lock */ KeAcquireGuardedMutex(Mcb->GuardedMutex); NumberOfRuns = Mcb->BaseMcb.PairCount; KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %d\n", NumberOfRuns); + DPRINT("Done %d\n", NumberOfRuns); /* Return the count */ return NumberOfRuns; @@ -556,87 +551,81 @@ IN LONGLONG SectorCount) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - LARGE_MCB_MAPPING_ENTRY Node; - LARGE_MCB_MAPPING_ENTRY NewElement; - PLARGE_MCB_MAPPING_ENTRY Element; - PLARGE_MCB_MAPPING_ENTRY Reinserted, Inserted; - LARGE_INTEGER StartHole, EndHole, EndRun; - - Node.RunStartVbn.QuadPart = Vbn; - Node.SectorCount.QuadPart = SectorCount; - - while ((Element = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Node))) - { + LARGE_MCB_MAPPING_ENTRY Node; + LARGE_MCB_MAPPING_ENTRY NewElement; + PLARGE_MCB_MAPPING_ENTRY Element; + PLARGE_MCB_MAPPING_ENTRY Reinserted, Inserted; + LARGE_INTEGER StartHole, EndHole, EndRun; + + Node.RunStartVbn.QuadPart = Vbn; + Node.SectorCount.QuadPart = SectorCount; + + while ((Element = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Node))) + { DPRINT1("Node.RunStartVbn %I64d, Node.SectorCount %I64d\n", Node.RunStartVbn.QuadPart, Node.SectorCount.QuadPart); DPRINT1("Element %p, .RunStartVbn %I64d, .SectorCount %I64d\n", Element, Element->RunStartVbn.QuadPart, Element->SectorCount.QuadPart); - // Must split - if (Element->RunStartVbn.QuadPart < Node.RunStartVbn.QuadPart && - Element->SectorCount.QuadPart > Node.SectorCount.QuadPart) - { - LARGE_MCB_MAPPING_ENTRY Upper, Reinsert; - StartHole = Node.RunStartVbn; - EndHole.QuadPart = Node.RunStartVbn.QuadPart + Node.SectorCount.QuadPart; - - Upper.RunStartVbn.QuadPart = EndHole.QuadPart; - Upper.StartingLbn.QuadPart = - Element->StartingLbn.QuadPart + - EndHole.QuadPart - - Element->RunStartVbn.QuadPart; - Upper.SectorCount.QuadPart = - Element->SectorCount.QuadPart - - (EndHole.QuadPart - Element->RunStartVbn.QuadPart); - Reinsert = *Element; - Reinsert.SectorCount.QuadPart = - Element->RunStartVbn.QuadPart - StartHole.QuadPart; - RemoveEntryList(&Element->Sequence); - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); - Mcb->PairCount--; - - Reinserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Reinsert, sizeof(Reinsert), NULL); - InsertHeadList(&Mcb->Mapping->SequenceList, &Reinserted->Sequence); - Mcb->PairCount++; - - Inserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Upper, sizeof(Upper), NULL); - InsertHeadList(&Mcb->Mapping->SequenceList, &Inserted->Sequence); - Mcb->PairCount++; - } - else if (Element->RunStartVbn.QuadPart < Node.RunStartVbn.QuadPart) - { - StartHole = Node.RunStartVbn; - NewElement.RunStartVbn = Element->RunStartVbn; - NewElement.StartingLbn = Element->StartingLbn; - NewElement.SectorCount.QuadPart = StartHole.QuadPart - Element->StartingLbn.QuadPart; - - RemoveEntryList(&Element->Sequence); - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); - Mcb->PairCount--; - - Reinserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &NewElement, sizeof(NewElement), NULL); - InsertHeadList(&Mcb->Mapping->SequenceList, &Reinserted->Sequence); - Mcb->PairCount++; - } - else - { - EndHole = Element->RunStartVbn; - EndRun.QuadPart = Element->RunStartVbn.QuadPart + Element->SectorCount.QuadPart; - NewElement.RunStartVbn = EndHole; - NewElement.StartingLbn.QuadPart = Element->StartingLbn.QuadPart + (EndHole.QuadPart - Element->RunStartVbn.QuadPart); - NewElement.SectorCount.QuadPart = EndRun.QuadPart - EndHole.QuadPart; - - RemoveEntryList(&Element->Sequence); - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); - Mcb->PairCount--; - - Reinserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &NewElement, sizeof(NewElement), NULL); - InsertHeadList(&Mcb->Mapping->SequenceList, &Reinserted->Sequence); - Mcb->PairCount++; + // Must split + if (Element->RunStartVbn.QuadPart < Node.RunStartVbn.QuadPart && + Element->SectorCount.QuadPart > Node.SectorCount.QuadPart) + { + LARGE_MCB_MAPPING_ENTRY Upper, Reinsert; + StartHole = Node.RunStartVbn; + EndHole.QuadPart = Node.RunStartVbn.QuadPart + Node.SectorCount.QuadPart; + + Upper.RunStartVbn.QuadPart = EndHole.QuadPart; + Upper.StartingLbn.QuadPart = Element->StartingLbn.QuadPart + EndHole.QuadPart - Element->RunStartVbn.QuadPart; + Upper.SectorCount.QuadPart = Element->SectorCount.QuadPart - (EndHole.QuadPart - Element->RunStartVbn.QuadPart); + Reinsert = *Element; + Reinsert.SectorCount.QuadPart = Element->RunStartVbn.QuadPart - StartHole.QuadPart; + RemoveEntryList(&Element->Sequence); + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); + Mcb->PairCount--; + + Reinserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Reinsert, sizeof(Reinsert), NULL); + InsertHeadList(&Mcb->Mapping->SequenceList, &Reinserted->Sequence); + Mcb->PairCount++; + + Inserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Upper, sizeof(Upper), NULL); + InsertHeadList(&Mcb->Mapping->SequenceList, &Inserted->Sequence); + Mcb->PairCount++; + } + else if (Element->RunStartVbn.QuadPart < Node.RunStartVbn.QuadPart) + { + StartHole = Node.RunStartVbn; + NewElement.RunStartVbn = Element->RunStartVbn; + NewElement.StartingLbn = Element->StartingLbn; + NewElement.SectorCount.QuadPart = StartHole.QuadPart - Element->StartingLbn.QuadPart; + + RemoveEntryList(&Element->Sequence); + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); + Mcb->PairCount--; + + Reinserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &NewElement, sizeof(NewElement), NULL); + InsertHeadList(&Mcb->Mapping->SequenceList, &Reinserted->Sequence); + Mcb->PairCount++; + } + else + { + EndHole = Element->RunStartVbn; + EndRun.QuadPart = Element->RunStartVbn.QuadPart + Element->SectorCount.QuadPart; + NewElement.RunStartVbn = EndHole; + NewElement.StartingLbn.QuadPart = Element->StartingLbn.QuadPart + (EndHole.QuadPart - Element->RunStartVbn.QuadPart); + NewElement.SectorCount.QuadPart = EndRun.QuadPart - EndHole.QuadPart; + + RemoveEntryList(&Element->Sequence); + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); + Mcb->PairCount--; + + Reinserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &NewElement, sizeof(NewElement), NULL); + InsertHeadList(&Mcb->Mapping->SequenceList, &Reinserted->Sequence); + Mcb->PairCount++; DPRINT1("Reinserted %p, .RunStartVbn %I64d, .SectorCount %I64d\n", Reinserted, Reinserted->RunStartVbn.QuadPart, Reinserted->SectorCount.QuadPart); DPRINT1("NewElement .RunStartVbn %I64d, .SectorCount %I64d\n", NewElement.RunStartVbn.QuadPart, NewElement.SectorCount.QuadPart); - } - } - - return TRUE; + } + } + + return TRUE; } /* @@ -648,15 +637,13 @@ IN LONGLONG Vbn, IN LONGLONG SectorCount) { - DPRINT("FsRtlRemoveLargeMcbEntry Mcb %x, Vbn %I64d, SectorCount %I64d\n", Mcb, (ULONG)Vbn, (ULONG)SectorCount); + DPRINT("FsRtlRemoveLargeMcbEntry Mcb %x, Vbn %I64d, SectorCount %I64d\n", Mcb, (ULONG)Vbn, (ULONG)SectorCount); KeAcquireGuardedMutex(Mcb->GuardedMutex); - FsRtlRemoveBaseMcbEntry(&(Mcb->BaseMcb), - Vbn, - SectorCount); + FsRtlRemoveBaseMcbEntry(&(Mcb->BaseMcb), Vbn, SectorCount); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done\n"); + DPRINT("Done\n"); } /* @@ -667,16 +654,16 @@ FsRtlResetBaseMcb(IN PBASE_MCB OpaqueMcb) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - PLARGE_MCB_MAPPING_ENTRY Element; - - while (RtlNumberGenericTableElements(&Mcb->Mapping->Table) && - (Element = (PLARGE_MCB_MAPPING_ENTRY)RtlGetElementGenericTable(&Mcb->Mapping->Table, 0))) - { - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); - } - - Mcb->PairCount = 0; - Mcb->MaximumPairCount = 0; + PLARGE_MCB_MAPPING_ENTRY Element; + + while (RtlNumberGenericTableElements(&Mcb->Mapping->Table) && + (Element = (PLARGE_MCB_MAPPING_ENTRY)RtlGetElementGenericTable(&Mcb->Mapping->Table, 0))) + { + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); + } + + Mcb->PairCount = 0; + Mcb->MaximumPairCount = 0; } /* @@ -688,17 +675,12 @@ IN BOOLEAN SelfSynchronized) { if (!SelfSynchronized) - { KeAcquireGuardedMutex(Mcb->GuardedMutex); - } - - FsRtlResetBaseMcb(&Mcb->BaseMcb); - + + FsRtlResetBaseMcb(&Mcb->BaseMcb); if (!SelfSynchronized) - { - KeReleaseGuardedMutex(Mcb->GuardedMutex); - } + KeReleaseGuardedMutex(Mcb->GuardedMutex); } #define MCB_BUMP_NO_MORE 0 @@ -706,34 +688,36 @@ static ULONG NTAPI McbBump(PBASE_MCB_INTERNAL Mcb, PLARGE_MCB_MAPPING_ENTRY FixedPart) { - LARGE_MCB_MAPPING_ENTRY Reimagined; - PLARGE_MCB_MAPPING_ENTRY Found = NULL; - - DPRINT("McbBump %x (%x:%x)\n", Mcb, FixedPart->RunStartVbn.LowPart, FixedPart->SectorCount.LowPart); - - Reimagined = *FixedPart; - while ((Found = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Reimagined))) - { - Reimagined = *Found; - Reimagined.RunStartVbn.QuadPart = - FixedPart->RunStartVbn.QuadPart + FixedPart->SectorCount.QuadPart; - DPRINT("Reimagined %x\n", Reimagined.RunStartVbn.LowPart); - } - - DPRINT("Found %x\n", Found); - if (!Found) return MCB_BUMP_NO_MORE; - DPRINT1 - ("Moving %x-%x to %x because %x-%x overlaps\n", - Found->RunStartVbn.LowPart, - Found->RunStartVbn.LowPart + Found->SectorCount.QuadPart, - Reimagined.RunStartVbn.LowPart + Reimagined.SectorCount.LowPart, - Reimagined.RunStartVbn.LowPart, - Reimagined.RunStartVbn.LowPart + Reimagined.SectorCount.LowPart); - Found->RunStartVbn.QuadPart = Reimagined.RunStartVbn.QuadPart + Reimagined.SectorCount.QuadPart; - Found->StartingLbn.QuadPart = Reimagined.StartingLbn.QuadPart + Reimagined.SectorCount.QuadPart; - - DPRINT("Again\n"); - return MCB_BUMP_AGAIN; + LARGE_MCB_MAPPING_ENTRY Reimagined; + PLARGE_MCB_MAPPING_ENTRY Found = NULL; + + DPRINT("McbBump %x (%x:%x)\n", Mcb, FixedPart->RunStartVbn.LowPart, FixedPart->SectorCount.LowPart); + + Reimagined = *FixedPart; + while ((Found = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Reimagined))) + { + Reimagined = *Found; + Reimagined.RunStartVbn.QuadPart = + FixedPart->RunStartVbn.QuadPart + FixedPart->SectorCount.QuadPart; + DPRINT("Reimagined %x\n", Reimagined.RunStartVbn.LowPart); + } + + DPRINT("Found %x\n", Found); + if (!Found) return MCB_BUMP_NO_MORE; + + DPRINT1 + ("Moving %x-%x to %x because %x-%x overlaps\n", + Found->RunStartVbn.LowPart, + Found->RunStartVbn.LowPart + Found->SectorCount.QuadPart, + Reimagined.RunStartVbn.LowPart + Reimagined.SectorCount.LowPart, + Reimagined.RunStartVbn.LowPart, + Reimagined.RunStartVbn.LowPart + Reimagined.SectorCount.LowPart); + + Found->RunStartVbn.QuadPart = Reimagined.RunStartVbn.QuadPart + Reimagined.SectorCount.QuadPart; + Found->StartingLbn.QuadPart = Reimagined.StartingLbn.QuadPart + Reimagined.SectorCount.QuadPart; + + DPRINT("Again\n"); + return MCB_BUMP_AGAIN; } /* @@ -746,72 +730,72 @@ IN LONGLONG Amount) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - ULONG Result; - LARGE_MCB_MAPPING_ENTRY Node; - PLARGE_MCB_MAPPING_ENTRY Existing = NULL; - - Node.RunStartVbn.QuadPart = Vbn; - Node.SectorCount.QuadPart = 0; - - Existing = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Node); - - if (Existing) - { - // We're in the middle of a run - LARGE_MCB_MAPPING_ENTRY UpperPart; - LARGE_MCB_MAPPING_ENTRY LowerPart; - PLARGE_MCB_MAPPING_ENTRY InsertedUpper; - - UpperPart.RunStartVbn.QuadPart = Node.RunStartVbn.QuadPart + Amount; - UpperPart.SectorCount.QuadPart = Existing->RunStartVbn.QuadPart + - (Existing->SectorCount.QuadPart - Node.RunStartVbn.QuadPart); - UpperPart.StartingLbn.QuadPart = Existing->StartingLbn.QuadPart + - (Node.RunStartVbn.QuadPart - Existing->RunStartVbn.QuadPart); - LowerPart.RunStartVbn.QuadPart = Existing->RunStartVbn.QuadPart; - LowerPart.SectorCount.QuadPart = Node.RunStartVbn.QuadPart - Existing->RunStartVbn.QuadPart; - LowerPart.StartingLbn.QuadPart = Existing->StartingLbn.QuadPart; - - Node = UpperPart; - - DPRINT("Loop: %x\n", Node.RunStartVbn.LowPart); - while ((Result = McbBump(Mcb, &Node)) == MCB_BUMP_AGAIN) - { - DPRINT("Node: %x\n", Node.RunStartVbn.LowPart); - } - DPRINT("Done\n"); - - if (Result == MCB_BUMP_NO_MORE) - { - Node = *Existing; - RemoveHeadList(&Existing->Sequence); - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Existing); - Mcb->PairCount--; - - // Adjust the element we found. - Existing->SectorCount = LowerPart.SectorCount; - - InsertedUpper = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &UpperPart, sizeof(UpperPart), NULL); - if (!InsertedUpper) - { - // Just make it like it was - Existing->SectorCount = Node.SectorCount; - return FALSE; - } - InsertHeadList(&Mcb->Mapping->SequenceList, &InsertedUpper->Sequence); - Mcb->PairCount++; - } - else - { - Node.RunStartVbn.QuadPart = Vbn; - Node.SectorCount.QuadPart = Amount; - while ((Result = McbBump(Mcb, &Node)) == MCB_BUMP_AGAIN); - return Result == MCB_BUMP_NO_MORE; - } - } - - DPRINT("Done\n"); - - return TRUE; + ULONG Result; + LARGE_MCB_MAPPING_ENTRY Node; + PLARGE_MCB_MAPPING_ENTRY Existing = NULL; + + Node.RunStartVbn.QuadPart = Vbn; + Node.SectorCount.QuadPart = 0; + + Existing = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Node); + + if (Existing) + { + // We're in the middle of a run + LARGE_MCB_MAPPING_ENTRY UpperPart; + LARGE_MCB_MAPPING_ENTRY LowerPart; + PLARGE_MCB_MAPPING_ENTRY InsertedUpper; + + UpperPart.RunStartVbn.QuadPart = Node.RunStartVbn.QuadPart + Amount; + UpperPart.SectorCount.QuadPart = Existing->RunStartVbn.QuadPart + + (Existing->SectorCount.QuadPart - Node.RunStartVbn.QuadPart); + UpperPart.StartingLbn.QuadPart = Existing->StartingLbn.QuadPart + + (Node.RunStartVbn.QuadPart - Existing->RunStartVbn.QuadPart); + LowerPart.RunStartVbn.QuadPart = Existing->RunStartVbn.QuadPart; + LowerPart.SectorCount.QuadPart = Node.RunStartVbn.QuadPart - Existing->RunStartVbn.QuadPart; + LowerPart.StartingLbn.QuadPart = Existing->StartingLbn.QuadPart; + + Node = UpperPart; + + DPRINT("Loop: %x\n", Node.RunStartVbn.LowPart); + while ((Result = McbBump(Mcb, &Node)) == MCB_BUMP_AGAIN) + { + DPRINT("Node: %x\n", Node.RunStartVbn.LowPart); + } + DPRINT("Done\n"); + + if (Result == MCB_BUMP_NO_MORE) + { + Node = *Existing; + RemoveHeadList(&Existing->Sequence); + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Existing); + Mcb->PairCount--; + + // Adjust the element we found. + Existing->SectorCount = LowerPart.SectorCount; + + InsertedUpper = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &UpperPart, sizeof(UpperPart), NULL); + if (!InsertedUpper) + { + // Just make it like it was + Existing->SectorCount = Node.SectorCount; + return FALSE; + } + InsertHeadList(&Mcb->Mapping->SequenceList, &InsertedUpper->Sequence); + Mcb->PairCount++; + } + else + { + Node.RunStartVbn.QuadPart = Vbn; + Node.SectorCount.QuadPart = Amount; + while ((Result = McbBump(Mcb, &Node)) == MCB_BUMP_AGAIN); + return Result == MCB_BUMP_NO_MORE; + } + } + + DPRINT("Done\n"); + + return TRUE; } /* @@ -825,7 +809,7 @@ { BOOLEAN Result; - DPRINT("FsRtlSplitLargeMcb %x, Vbn %x, Amount %x\n", Mcb, (ULONG)Vbn, (ULONG)Amount); + DPRINT("FsRtlSplitLargeMcb %x, Vbn %x, Amount %x\n", Mcb, (ULONG)Vbn, (ULONG)Amount); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlSplitBaseMcb(&(Mcb->BaseMcb), @@ -833,7 +817,7 @@ Amount); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %d\n", Result); + DPRINT("Done %d\n", Result); return Result; } @@ -847,23 +831,23 @@ IN LONGLONG Vbn) { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; - if (!Vbn) - { - FsRtlResetBaseMcb(OpaqueMcb); - } - else - { - LARGE_MCB_MAPPING_ENTRY Truncate; - PLARGE_MCB_MAPPING_ENTRY Found; - Truncate.RunStartVbn.QuadPart = Vbn; - Truncate.SectorCount.QuadPart = (1ull<<62) - Truncate.RunStartVbn.QuadPart; - while ((Found = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Truncate))) - { - RemoveEntryList(&Found->Sequence); - RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Found); - Mcb->PairCount--; - } - } + if (!Vbn) + { + FsRtlResetBaseMcb(OpaqueMcb); + } + else + { + LARGE_MCB_MAPPING_ENTRY Truncate; + PLARGE_MCB_MAPPING_ENTRY Found; + Truncate.RunStartVbn.QuadPart = Vbn; + Truncate.SectorCount.QuadPart = (1ull<<62) - Truncate.RunStartVbn.QuadPart; + while ((Found = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Truncate))) + { + RemoveEntryList(&Found->Sequence); + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Found); + Mcb->PairCount--; + } + } } /* @@ -874,12 +858,11 @@ FsRtlTruncateLargeMcb(IN PLARGE_MCB Mcb, IN LONGLONG Vbn) { - DPRINT("FsRtlTruncateLargeMcb %x Vbn %x\n", Mcb, (ULONG)Vbn); + DPRINT("FsRtlTruncateLargeMcb %x Vbn %x\n", Mcb, (ULONG)Vbn); KeAcquireGuardedMutex(Mcb->GuardedMutex); - FsRtlTruncateBaseMcb(&(Mcb->BaseMcb), - Vbn); + FsRtlTruncateBaseMcb(&(Mcb->BaseMcb), Vbn); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done\n"); + DPRINT("Done\n"); } /* @@ -889,7 +872,7 @@ NTAPI FsRtlUninitializeBaseMcb(IN PBASE_MCB Mcb) { - FsRtlResetBaseMcb(Mcb); + FsRtlResetBaseMcb(Mcb); if ((Mcb->PoolType == PagedPool) && (Mcb->MaximumPairCount == MAXIMUM_PAIR_COUNT)) { @@ -916,4 +899,3 @@ FsRtlUninitializeBaseMcb(&(Mcb->BaseMcb)); } } -

11 years, 4 months

[fireball] 58889: [FSRTL] - Start bringing sanity to FSRTL Large MCB implementation: * Get rid of the GET_LIST_HEAD macro and define a proper private struct to access its members. That's much more ...

by fireball＠svn.reactos.org

Author: fireball Date: Mon Apr 29 10:10:44 2013 New Revision: 58889 URL: http://svn.reactos.org/svn/reactos?rev=58889&view=rev Log: [FSRTL] - Start bringing sanity to FSRTL Large MCB implementation: * Get rid of the GET_LIST_HEAD macro and define a proper private struct to access its members. That's much more flexible,and that's how it's usually done in hundreds of other places in the kernel. Otherwise we might just forget about structs and invent macros to access individual virtual fields in a byte array :) * Going through the code (first, preliminary pass) and putting helper debug prints, especially when the code does not work as expected. * Move variables definitions to the beginning of the function (thus get rid of up to local vars being redifined up to 3x times within a single function). Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Mon Apr 29 10:10:44 2013 @@ -16,8 +16,6 @@ /* GLOBALS *******************************************************************/ -#define GET_LIST_HEAD(x) ((PLIST_ENTRY)(&((PRTL_GENERIC_TABLE)x)[1])) - PAGED_LOOKASIDE_LIST FsRtlFirstMappingLookasideList; NPAGED_LOOKASIDE_LIST FsRtlFastMutexLookasideList; @@ -28,6 +26,21 @@ LARGE_INTEGER StartingLbn; LIST_ENTRY Sequence; } LARGE_MCB_MAPPING_ENTRY, *PLARGE_MCB_MAPPING_ENTRY; + +typedef struct _LARGE_MCB_MAPPING +{ + RTL_GENERIC_TABLE Table; + LIST_ENTRY SequenceList; +} LARGE_MCB_MAPPING, *PLARGE_MCB_MAPPING; + +typedef struct _BASE_MCB_INTERNAL { + ULONG MaximumPairCount; + ULONG PairCount; + USHORT PoolType; + USHORT Flags; + PLARGE_MCB_MAPPING Mapping; +} BASE_MCB_INTERNAL, *PBASE_MCB_INTERNAL; + static PVOID NTAPI McbMappingAllocate(PRTL_GENERIC_TABLE Table, CLONG Bytes) { @@ -63,11 +76,12 @@ */ BOOLEAN NTAPI -FsRtlAddBaseMcbEntry(IN PBASE_MCB Mcb, +FsRtlAddBaseMcbEntry(IN PBASE_MCB OpaqueMcb, IN LONGLONG Vbn, IN LONGLONG Lbn, IN LONGLONG SectorCount) { + PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; LARGE_MCB_MAPPING_ENTRY Node; PLARGE_MCB_MAPPING_ENTRY Existing = NULL; BOOLEAN NewElement = FALSE; @@ -79,8 +93,7 @@ while (!NewElement) { DPRINT("Inserting %x:%x\n", Node.RunStartVbn.LowPart, Node.SectorCount.LowPart); - Existing = RtlInsertElementGenericTable - (Mcb->Mapping, &Node, sizeof(Node), &NewElement); + Existing = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Node, sizeof(Node), &NewElement); DPRINT("Existing %x\n", Existing); if (!Existing) break; @@ -89,8 +102,7 @@ { // We merge the existing runs LARGE_INTEGER StartVbn, FinalVbn; - DPRINT("Existing: %x:%x\n", - Existing->RunStartVbn.LowPart, Node.SectorCount.LowPart); + DPRINT("Existing: %x:%x\n", Existing->RunStartVbn.LowPart, Node.SectorCount.LowPart); if (Existing->RunStartVbn.QuadPart < Node.RunStartVbn.QuadPart) { StartVbn = Existing->RunStartVbn; @@ -116,7 +128,7 @@ Node.RunStartVbn.QuadPart = StartVbn.QuadPart; Node.SectorCount.QuadPart = FinalVbn.QuadPart - StartVbn.QuadPart; RemoveHeadList(&Existing->Sequence); - RtlDeleteElementGenericTable(Mcb->Mapping, Existing); + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Existing); Mcb->PairCount--; } else @@ -124,7 +136,7 @@ DPRINT("Mapping added %x\n", Existing); Mcb->MaximumPairCount++; Mcb->PairCount++; - InsertHeadList(GET_LIST_HEAD(Mcb->Mapping), &Existing->Sequence); + InsertHeadList(&Mcb->Mapping->SequenceList, &Existing->Sequence); } } @@ -163,20 +175,21 @@ */ BOOLEAN NTAPI -FsRtlGetNextBaseMcbEntry(IN PBASE_MCB Mcb, +FsRtlGetNextBaseMcbEntry(IN PBASE_MCB OpaqueMcb, IN ULONG RunIndex, OUT PLONGLONG Vbn, OUT PLONGLONG Lbn, OUT PLONGLONG SectorCount) { + PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; ULONG i = 0; BOOLEAN Result = FALSE; PLARGE_MCB_MAPPING_ENTRY Entry; for (Entry = (PLARGE_MCB_MAPPING_ENTRY) - RtlEnumerateGenericTable(Mcb->Mapping, TRUE); + RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); Entry && i < RunIndex; Entry = (PLARGE_MCB_MAPPING_ENTRY) - RtlEnumerateGenericTable(Mcb->Mapping, FALSE), i++); + RtlEnumerateGenericTable(&Mcb->Mapping->Table, FALSE), i++); if (Entry) { Result = TRUE; @@ -224,9 +237,10 @@ */ VOID NTAPI -FsRtlInitializeBaseMcb(IN PBASE_MCB Mcb, +FsRtlInitializeBaseMcb(IN PBASE_MCB OpaqueMcb, IN POOL_TYPE PoolType) { + PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; Mcb->PairCount = 0; if (PoolType == PagedPool) @@ -236,19 +250,19 @@ else { Mcb->Mapping = ExAllocatePoolWithTag(PoolType | POOL_RAISE_IF_ALLOCATION_FAILURE, - sizeof(RTL_GENERIC_TABLE) + sizeof(LIST_ENTRY), + sizeof(LARGE_MCB_MAPPING), 'FSBC'); } Mcb->PoolType = PoolType; Mcb->MaximumPairCount = MAXIMUM_PAIR_COUNT; RtlInitializeGenericTable - (Mcb->Mapping, + (&Mcb->Mapping->Table, (PRTL_GENERIC_COMPARE_ROUTINE)McbMappingCompare, McbMappingAllocate, McbMappingFree, Mcb); - InitializeListHead(GET_LIST_HEAD(Mcb->Mapping)); + InitializeListHead(&Mcb->Mapping->SequenceList); } /* @@ -288,7 +302,7 @@ NULL, NULL, POOL_RAISE_IF_ALLOCATION_FAILURE, - sizeof(RTL_GENERIC_TABLE) + sizeof(LIST_ENTRY), + sizeof(LARGE_MCB_MAPPING), IFS_POOL_TAG, 0); /* FIXME: Should be 4 */ @@ -307,7 +321,7 @@ */ BOOLEAN NTAPI -FsRtlLookupBaseMcbEntry(IN PBASE_MCB Mcb, +FsRtlLookupBaseMcbEntry(IN PBASE_MCB OpaqueMcb, IN LONGLONG Vbn, OUT PLONGLONG Lbn OPTIONAL, OUT PLONGLONG SectorCountFromLbn OPTIONAL, @@ -315,6 +329,7 @@ OUT PLONGLONG SectorCountFromStartingLbn OPTIONAL, OUT PULONG Index OPTIONAL) { + PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; BOOLEAN Result = FALSE; LARGE_MCB_MAPPING_ENTRY ToLookup; PLARGE_MCB_MAPPING_ENTRY Entry; @@ -322,13 +337,15 @@ ToLookup.RunStartVbn.QuadPart = Vbn; ToLookup.SectorCount.QuadPart = 1; - Entry = RtlLookupElementGenericTable(Mcb->Mapping, &ToLookup); + Entry = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &ToLookup); + DPRINT("Entry %p\n", Entry); if (!Entry) { // Find out if we have a following entry. The spec says we should return // found with Lbn == -1 when we're beneath the largest map. ToLookup.SectorCount.QuadPart = (1ull<<62) - ToLookup.RunStartVbn.QuadPart; - Entry = RtlLookupElementGenericTable(Mcb->Mapping, &ToLookup); + Entry = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &ToLookup); + DPRINT("Entry %p\n", Entry); if (Entry) { Result = TRUE; @@ -349,7 +366,7 @@ if (StartingLbn) *StartingLbn = Entry->StartingLbn.QuadPart; if (SectorCountFromStartingLbn) *SectorCountFromStartingLbn = Entry->SectorCount.QuadPart; } - + DPRINT("Done\n"); return Result; } @@ -395,13 +412,14 @@ IN OUT PLONGLONG LargeLbn, IN OUT PULONG Index) { + PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; ULONG i = 0; BOOLEAN Result = FALSE; PLIST_ENTRY ListEntry; PLARGE_MCB_MAPPING_ENTRY Entry; PLARGE_MCB_MAPPING_ENTRY CountEntry; - ListEntry = GET_LIST_HEAD(OpaqueMcb->Mapping); + ListEntry = &Mcb->Mapping->SequenceList; if (!IsListEmpty(ListEntry)) { Entry = CONTAINING_RECORD(ListEntry->Flink, LARGE_MCB_MAPPING_ENTRY, Sequence); @@ -409,10 +427,10 @@ *LargeVbn = Entry->RunStartVbn.QuadPart; *LargeLbn = Entry->StartingLbn.QuadPart; - for (i = 0, CountEntry = RtlEnumerateGenericTable(OpaqueMcb->Mapping, TRUE); + for (i = 0, CountEntry = RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); CountEntry != Entry; - CountEntry = RtlEnumerateGenericTable(OpaqueMcb->Mapping, FALSE)); - + CountEntry = RtlEnumerateGenericTable(&Mcb->Mapping->Table, FALSE)); + DPRINT1("Most probably we are returning shit now\n"); *Index = i; } @@ -450,15 +468,16 @@ */ BOOLEAN NTAPI -FsRtlLookupLastBaseMcbEntry(IN PBASE_MCB Mcb, +FsRtlLookupLastBaseMcbEntry(IN PBASE_MCB OpaqueMcb, OUT PLONGLONG Vbn, OUT PLONGLONG Lbn) { + PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; BOOLEAN Result = FALSE; PLIST_ENTRY ListEntry; PLARGE_MCB_MAPPING_ENTRY Entry; - ListEntry = GET_LIST_HEAD(Mcb->Mapping); + ListEntry = &Mcb->Mapping->SequenceList; if (!IsListEmpty(ListEntry)) { Entry = CONTAINING_RECORD(ListEntry->Flink, LARGE_MCB_MAPPING_ENTRY, Sequence); @@ -532,27 +551,32 @@ */ BOOLEAN NTAPI -FsRtlRemoveBaseMcbEntry(IN PBASE_MCB Mcb, +FsRtlRemoveBaseMcbEntry(IN PBASE_MCB OpaqueMcb, IN LONGLONG Vbn, IN LONGLONG SectorCount) { + PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; LARGE_MCB_MAPPING_ENTRY Node; + LARGE_MCB_MAPPING_ENTRY NewElement; PLARGE_MCB_MAPPING_ENTRY Element; + PLARGE_MCB_MAPPING_ENTRY Reinserted, Inserted; + LARGE_INTEGER StartHole, EndHole, EndRun; Node.RunStartVbn.QuadPart = Vbn; Node.SectorCount.QuadPart = SectorCount; - while ((Element = RtlLookupElementGenericTable(Mcb->Mapping, &Node))) - { + while ((Element = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Node))) + { + DPRINT1("Node.RunStartVbn %I64d, Node.SectorCount %I64d\n", Node.RunStartVbn.QuadPart, Node.SectorCount.QuadPart); + DPRINT1("Element %p, .RunStartVbn %I64d, .SectorCount %I64d\n", Element, Element->RunStartVbn.QuadPart, Element->SectorCount.QuadPart); // Must split if (Element->RunStartVbn.QuadPart < Node.RunStartVbn.QuadPart && Element->SectorCount.QuadPart > Node.SectorCount.QuadPart) { LARGE_MCB_MAPPING_ENTRY Upper, Reinsert; - PLARGE_MCB_MAPPING_ENTRY Reinserted, Inserted; - LARGE_INTEGER StartHole = Node.RunStartVbn; - LARGE_INTEGER EndHole; + StartHole = Node.RunStartVbn; EndHole.QuadPart = Node.RunStartVbn.QuadPart + Node.SectorCount.QuadPart; + Upper.RunStartVbn.QuadPart = EndHole.QuadPart; Upper.StartingLbn.QuadPart = Element->StartingLbn.QuadPart + @@ -565,57 +589,50 @@ Reinsert.SectorCount.QuadPart = Element->RunStartVbn.QuadPart - StartHole.QuadPart; RemoveEntryList(&Element->Sequence); - RtlDeleteElementGenericTable(Mcb->Mapping, Element); + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); Mcb->PairCount--; - Reinserted = RtlInsertElementGenericTable - (Mcb->Mapping, &Reinsert, sizeof(Reinsert), NULL); - InsertHeadList(GET_LIST_HEAD(Mcb->Mapping), &Reinserted->Sequence); + Reinserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Reinsert, sizeof(Reinsert), NULL); + InsertHeadList(&Mcb->Mapping->SequenceList, &Reinserted->Sequence); Mcb->PairCount++; - Inserted = RtlInsertElementGenericTable - (Mcb->Mapping, &Upper, sizeof(Upper), NULL); - InsertHeadList(GET_LIST_HEAD(Mcb->Mapping), &Inserted->Sequence); + Inserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Upper, sizeof(Upper), NULL); + InsertHeadList(&Mcb->Mapping->SequenceList, &Inserted->Sequence); Mcb->PairCount++; } else if (Element->RunStartVbn.QuadPart < Node.RunStartVbn.QuadPart) { - LARGE_MCB_MAPPING_ENTRY NewElement; - PLARGE_MCB_MAPPING_ENTRY Reinserted; - LARGE_INTEGER StartHole = Node.RunStartVbn; + StartHole = Node.RunStartVbn; NewElement.RunStartVbn = Element->RunStartVbn; NewElement.StartingLbn = Element->StartingLbn; NewElement.SectorCount.QuadPart = StartHole.QuadPart - Element->StartingLbn.QuadPart; RemoveEntryList(&Element->Sequence); - RtlDeleteElementGenericTable(Mcb->Mapping, Element); + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); Mcb->PairCount--; - Reinserted = RtlInsertElementGenericTable - (Mcb->Mapping, &NewElement, sizeof(NewElement), NULL); - InsertHeadList(GET_LIST_HEAD(Mcb->Mapping), &Reinserted->Sequence); - Mcb->PairCount++; + Reinserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &NewElement, sizeof(NewElement), NULL); + InsertHeadList(&Mcb->Mapping->SequenceList, &Reinserted->Sequence); + Mcb->PairCount++; } else { - LARGE_MCB_MAPPING_ENTRY NewElement; - PLARGE_MCB_MAPPING_ENTRY Reinserted; - LARGE_INTEGER EndHole = Element->RunStartVbn; - LARGE_INTEGER EndRun; + EndHole = Element->RunStartVbn; EndRun.QuadPart = Element->RunStartVbn.QuadPart + Element->SectorCount.QuadPart; NewElement.RunStartVbn = EndHole; - NewElement.StartingLbn.QuadPart = Element->StartingLbn.QuadPart + - (EndHole.QuadPart - Element->RunStartVbn.QuadPart); + NewElement.StartingLbn.QuadPart = Element->StartingLbn.QuadPart + (EndHole.QuadPart - Element->RunStartVbn.QuadPart); NewElement.SectorCount.QuadPart = EndRun.QuadPart - EndHole.QuadPart; RemoveEntryList(&Element->Sequence); - RtlDeleteElementGenericTable(Mcb->Mapping, Element); + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); Mcb->PairCount--; - Reinserted = RtlInsertElementGenericTable - (Mcb->Mapping, &NewElement, sizeof(NewElement), NULL); - InsertHeadList(GET_LIST_HEAD(Mcb->Mapping), &Reinserted->Sequence); - Mcb->PairCount++; + Reinserted = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &NewElement, sizeof(NewElement), NULL); + InsertHeadList(&Mcb->Mapping->SequenceList, &Reinserted->Sequence); + Mcb->PairCount++; + + DPRINT1("Reinserted %p, .RunStartVbn %I64d, .SectorCount %I64d\n", Reinserted, Reinserted->RunStartVbn.QuadPart, Reinserted->SectorCount.QuadPart); + DPRINT1("NewElement .RunStartVbn %I64d, .SectorCount %I64d\n", NewElement.RunStartVbn.QuadPart, NewElement.SectorCount.QuadPart); } } @@ -631,7 +648,7 @@ IN LONGLONG Vbn, IN LONGLONG SectorCount) { - DPRINT("FsRtlRemoveLargeMcbEntry Mcb %x, Vbn %x, SectorCount %x\n", Mcb, (ULONG)Vbn, (ULONG)SectorCount); + DPRINT("FsRtlRemoveLargeMcbEntry Mcb %x, Vbn %I64d, SectorCount %I64d\n", Mcb, (ULONG)Vbn, (ULONG)SectorCount); KeAcquireGuardedMutex(Mcb->GuardedMutex); FsRtlRemoveBaseMcbEntry(&(Mcb->BaseMcb), @@ -647,14 +664,15 @@ */ VOID NTAPI -FsRtlResetBaseMcb(IN PBASE_MCB Mcb) -{ +FsRtlResetBaseMcb(IN PBASE_MCB OpaqueMcb) +{ + PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; PLARGE_MCB_MAPPING_ENTRY Element; - while (RtlNumberGenericTableElements(Mcb->Mapping) && - (Element = (PLARGE_MCB_MAPPING_ENTRY)RtlGetElementGenericTable(Mcb->Mapping, 0))) - { - RtlDeleteElementGenericTable(Mcb->Mapping, Element); + while (RtlNumberGenericTableElements(&Mcb->Mapping->Table) && + (Element = (PLARGE_MCB_MAPPING_ENTRY)RtlGetElementGenericTable(&Mcb->Mapping->Table, 0))) + { + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Element); } Mcb->PairCount = 0; @@ -686,7 +704,7 @@ #define MCB_BUMP_NO_MORE 0 #define MCB_BUMP_AGAIN 1 -static ULONG NTAPI McbBump(PBASE_MCB Mcb, PLARGE_MCB_MAPPING_ENTRY FixedPart) +static ULONG NTAPI McbBump(PBASE_MCB_INTERNAL Mcb, PLARGE_MCB_MAPPING_ENTRY FixedPart) { LARGE_MCB_MAPPING_ENTRY Reimagined; PLARGE_MCB_MAPPING_ENTRY Found = NULL; @@ -694,7 +712,7 @@ DPRINT("McbBump %x (%x:%x)\n", Mcb, FixedPart->RunStartVbn.LowPart, FixedPart->SectorCount.LowPart); Reimagined = *FixedPart; - while ((Found = RtlLookupElementGenericTable(Mcb->Mapping, &Reimagined))) + while ((Found = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Reimagined))) { Reimagined = *Found; Reimagined.RunStartVbn.QuadPart = @@ -723,10 +741,11 @@ */ BOOLEAN NTAPI -FsRtlSplitBaseMcb(IN PBASE_MCB Mcb, +FsRtlSplitBaseMcb(IN PBASE_MCB OpaqueMcb, IN LONGLONG Vbn, IN LONGLONG Amount) { + PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; ULONG Result; LARGE_MCB_MAPPING_ENTRY Node; PLARGE_MCB_MAPPING_ENTRY Existing = NULL; @@ -734,7 +753,7 @@ Node.RunStartVbn.QuadPart = Vbn; Node.SectorCount.QuadPart = 0; - Existing = RtlLookupElementGenericTable(Mcb->Mapping, &Node); + Existing = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Node); if (Existing) { @@ -765,21 +784,20 @@ { Node = *Existing; RemoveHeadList(&Existing->Sequence); - RtlDeleteElementGenericTable(Mcb->Mapping, Existing); + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Existing); Mcb->PairCount--; // Adjust the element we found. Existing->SectorCount = LowerPart.SectorCount; - InsertedUpper = RtlInsertElementGenericTable - (Mcb->Mapping, &UpperPart, sizeof(UpperPart), NULL); + InsertedUpper = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &UpperPart, sizeof(UpperPart), NULL); if (!InsertedUpper) { // Just make it like it was Existing->SectorCount = Node.SectorCount; return FALSE; } - InsertHeadList(GET_LIST_HEAD(Mcb->Mapping), &InsertedUpper->Sequence); + InsertHeadList(&Mcb->Mapping->SequenceList, &InsertedUpper->Sequence); Mcb->PairCount++; } else @@ -825,12 +843,13 @@ */ VOID NTAPI -FsRtlTruncateBaseMcb(IN PBASE_MCB Mcb, +FsRtlTruncateBaseMcb(IN PBASE_MCB OpaqueMcb, IN LONGLONG Vbn) { + PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; if (!Vbn) { - FsRtlResetBaseMcb(Mcb); + FsRtlResetBaseMcb(OpaqueMcb); } else { @@ -838,10 +857,10 @@ PLARGE_MCB_MAPPING_ENTRY Found; Truncate.RunStartVbn.QuadPart = Vbn; Truncate.SectorCount.QuadPart = (1ull<<62) - Truncate.RunStartVbn.QuadPart; - while ((Found = RtlLookupElementGenericTable(Mcb->Mapping, &Truncate))) + while ((Found = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &Truncate))) { RemoveEntryList(&Found->Sequence); - RtlDeleteElementGenericTable(Mcb->Mapping, Found); + RtlDeleteElementGenericTable(&Mcb->Mapping->Table, Found); Mcb->PairCount--; } }

11 years, 4 months

[cgutman] 58888: [NDIS] - Queue the miniport worker only after a previous operation has completed CORE-5734 #resolve #comment Fixed in r58888

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Apr 29 10:01:39 2013 New Revision: 58888 URL: http://svn.reactos.org/svn/reactos?rev=58888&view=rev Log: [NDIS] - Queue the miniport worker only after a previous operation has completed CORE-5734 #resolve #comment Fixed in r58888 Modified: trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Mon Apr 29 10:01:39 2013 @@ -197,4 +197,9 @@ MiniDoAddressingReset( PLOGICAL_ADAPTER Adapter); +VOID +MiniWorkItemComplete( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE WorkItemType); + /* EOF */ Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Apr 29 10:01:39 2013 @@ -127,7 +127,7 @@ while (CurrentEntry) { - if (CurrentEntry->WorkItemType == Type) + if (CurrentEntry->WorkItemType == Type || Type == NdisMaxWorkItems) return CurrentEntry; CurrentEntry = (PNDIS_MINIPORT_WORK_ITEM)CurrentEntry->Link.Next; @@ -146,18 +146,20 @@ KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - if (Type == NdisWorkItemRequest && - (Adapter->NdisMiniportBlock.PendingRequest || MiniGetFirstWorkItem(Adapter, NdisWorkItemRequest))) + if (MiniGetFirstWorkItem(Adapter, Type)) + { + Busy = TRUE; + } + else if (Type == NdisWorkItemRequest && Adapter->NdisMiniportBlock.PendingRequest) { Busy = TRUE; } - else if (Type == NdisWorkItemSend && - (Adapter->NdisMiniportBlock.FirstPendingPacket || MiniGetFirstWorkItem(Adapter, NdisWorkItemSend))) + else if (Type == NdisWorkItemSend && Adapter->NdisMiniportBlock.FirstPendingPacket) { Busy = TRUE; } - else if (Type == NdisWorkItemResetRequested && - (Adapter->NdisMiniportBlock.ResetStatus == NDIS_STATUS_PENDING || MiniGetFirstWorkItem(Adapter, NdisWorkItemResetRequested))) + else if (Type == NdisWorkItemResetRequested && + Adapter->NdisMiniportBlock.ResetStatus == NDIS_STATUS_PENDING) { Busy = TRUE; } @@ -501,8 +503,9 @@ KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); Adapter->NdisMiniportBlock.PendingRequest = NULL; KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - KeLowerIrql(OldIrql); + + MiniWorkItemComplete(Adapter, NdisWorkItemRequest); } VOID NTAPI @@ -553,6 +556,8 @@ Status); KeLowerIrql(OldIrql); + + MiniWorkItemComplete(Adapter, NdisWorkItemSend); } @@ -560,9 +565,8 @@ MiniSendResourcesAvailable( IN NDIS_HANDLE MiniportAdapterHandle) { -/* - UNIMPLEMENTED -*/ + /* Run the work if anything is waiting */ + MiniWorkItemComplete((PLOGICAL_ADAPTER)MiniportAdapterHandle, NdisWorkItemSend); } @@ -896,6 +900,8 @@ NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); NdisMIndicateStatusComplete(Adapter); + + MiniWorkItemComplete(Adapter, NdisWorkItemResetRequested); } return Status; @@ -914,6 +920,23 @@ NDIS_DbgPrint(MIN_TRACE, ("Miniport detected adapter hang\n")); MiniReset(Adapter); } +} + +VOID +MiniWorkItemComplete( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE WorkItemType) +{ + PIO_WORKITEM IoWorkItem; + + /* Check if there's anything queued to run after this work item */ + if (!MiniIsBusy(Adapter, WorkItemType)) + return; + + /* There is, so fire the worker */ + IoWorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject); + if (IoWorkItem) + IoQueueWorkItem(IoWorkItem, MiniportWorker, DelayedWorkQueue, IoWorkItem); } VOID @@ -934,7 +957,6 @@ */ { PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; - PIO_WORKITEM IoWorkItem; KIRQL OldIrql; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -982,10 +1004,6 @@ } } - IoWorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject); - if (IoWorkItem) - IoQueueWorkItem(IoWorkItem, MiniportWorker, DelayedWorkQueue, IoWorkItem); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -1114,6 +1132,11 @@ } KeLowerIrql(OldIrql); + + if (Status != NDIS_STATUS_PENDING) { + MiniWorkItemComplete(Adapter, NdisWorkItemRequest); + } + return Status; } Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Mon Apr 29 10:01:39 2013 @@ -424,6 +424,10 @@ NdisStatus = NDIS_STATUS_PENDING; } } + + if (NdisStatus != NDIS_STATUS_PENDING) { + MiniWorkItemComplete(Adapter, NdisWorkItemSend); + } return NdisStatus; } else { @@ -446,6 +450,10 @@ MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, TRUE); NdisStatus = NDIS_STATUS_PENDING; } + } + + if (NdisStatus != NDIS_STATUS_PENDING) { + MiniWorkItemComplete(Adapter, NdisWorkItemSend); } return NdisStatus;

11 years, 4 months

[gadamopoulos] 58887: [win32k] - Initialize SM_CXSCREEN and SM_CYSCREEN metrics in co_IntInitializeDesktopGraphics - Also move some code from IntCreatePrimarySurface to co_IntInitializeDesktopGraphics

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Apr 28 20:53:57 2013 New Revision: 58887 URL: http://svn.reactos.org/svn/reactos?rev=58887&view=rev Log: [win32k] - Initialize SM_CXSCREEN and SM_CYSCREEN metrics in co_IntInitializeDesktopGraphics - Also move some code from IntCreatePrimarySurface to co_IntInitializeDesktopGraphics Modified: trunk/reactos/win32ss/gdi/ntgdi/device.c trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/gdi/ntgdi/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/device.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/device.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/device.c [iso-8859-1] Sun Apr 28 20:53:57 2013 @@ -30,34 +30,13 @@ { SIZEL SurfSize; SURFOBJ *pso; - PDESKTOP rpDesk; /* Create surface */ pso = &PDEVOBJ_pSurface(gppdevPrimary)->SurfObj; SurfSize = pso->sizlBitmap; - /* Attach monitor */ - UserAttachMonitor((HDEV)gppdevPrimary); - DPRINT("IntCreatePrimarySurface, gppdevPrimary=%p, gppdevPrimary->pSurface = %p\n", gppdevPrimary, gppdevPrimary->pSurface); - - /* Put the pointer in the center of the screen */ - gpsi->ptCursor.x = pso->sizlBitmap.cx / 2; - gpsi->ptCursor.y = pso->sizlBitmap.cy / 2; - - rpDesk = IntGetActiveDesktop(); - if (!rpDesk) - { /* First time going in from winlogon and starting up application desktop and - haven't switch to winlogon desktop. Also still in WM_CREATE. */ - PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - rpDesk = pti->rpdesk; - if (!rpDesk) - { - DPRINT1("No DESKTOP Window!!!!!\n"); - } - } - co_IntShowDesktop(rpDesk, SurfSize.cx, SurfSize.cy, TRUE); // Init Primary Displays Device Capabilities. PDEVOBJ_vGetDeviceCaps(gppdevPrimary, &GdiHandleTable->DevCaps); Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Sun Apr 28 20:53:57 2013 @@ -235,6 +235,7 @@ { TEXTMETRICW tmw; UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"DISPLAY"); + PDESKTOP pdesk; ScreenDeviceContext = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); if (NULL == ScreenDeviceContext) @@ -249,15 +250,14 @@ return FALSE; } - /* Setup the cursor */ - co_IntLoadDefaultCursors(); - hSystemBM = NtGdiCreateCompatibleDC(ScreenDeviceContext); NtGdiSelectFont(hSystemBM, NtGdiGetStockObject(SYSTEM_FONT)); GreSetDCOwner(hSystemBM, GDI_OBJ_HMGR_PUBLIC); - // FIXME: Move these to a update routine. + /* Update the SERVERINFO */ + gpsi->aiSysMet[SM_CXSCREEN] = gppdevPrimary->gdiinfo.ulHorzRes; + gpsi->aiSysMet[SM_CYSCREEN] = gppdevPrimary->gdiinfo.ulVertRes; gpsi->Planes = NtGdiGetDeviceCaps(ScreenDeviceContext, PLANES); gpsi->BitsPixel = NtGdiGetDeviceCaps(ScreenDeviceContext, BITSPIXEL); gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; @@ -271,6 +271,21 @@ // Font is realized and this dc was previously set to internal DC_ATTR. gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, (DWORD*)&gpsi->cySysFontChar); gpsi->tmSysFont = tmw; + + /* Put the pointer in the center of the screen */ + gpsi->ptCursor.x = gpsi->aiSysMet[SM_CXSCREEN] / 2; + gpsi->ptCursor.y = gpsi->aiSysMet[SM_CYSCREEN] / 2; + + /* Attach monitor */ + UserAttachMonitor((HDEV)gppdevPrimary); + + /* Setup the cursor */ + co_IntLoadDefaultCursors(); + + /* Show the desktop */ + pdesk = IntGetActiveDesktop(); + ASSERT(pdesk); + co_IntShowDesktop(pdesk, gpsi->aiSysMet[SM_CXSCREEN], gpsi->aiSysMet[SM_CYSCREEN], TRUE); return TRUE; }

11 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2013