Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [CMD] Quick fix for the REM command parser. CORE-17030
by Hermès Bélusca-Maïto 11 May '20

11 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c11be5a3a95a35604f73… commit 9c11be5a3a95a35604f73062719431cf6df1ffb6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 11 04:22:58 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 11 04:27:12 2020 +0200 [CMD] Quick fix for the REM command parser. CORE-17030 --- base/shell/cmd/parser.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index cdea54a8f08..abf2353d563 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -575,9 +575,10 @@ error: /* Parse a REM command */ static PARSED_COMMAND *ParseRem(void) { - /* Just ignore the rest of the line */ - while (CurChar && CurChar != _T('\n')) - ParseChar(); + /* "Ignore" the rest of the line. + * (Line continuations will still be parsed, though.) */ + while (ParseToken(0, NULL) != TOK_END) + ; return NULL; }

1 0

[reactos] 01/01: [UMPNPMGR] Implement PNP_GetFirstLogConf and PNP_GetNextLogConf (WIP)
by Eric Kohl 10 May '20

10 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4246b64dcb8ae6478f516… commit 4246b64dcb8ae6478f516bfe934d5c749b77deb0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 10 20:45:11 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 10 20:46:41 2020 +0200 [UMPNPMGR] Implement PNP_GetFirstLogConf and PNP_GetNextLogConf (WIP) - PNP_GetFirstLogConf only works for resources lists. - PNP_GetNextLogConf does not return a valid tag yet. --- base/services/umpnpmgr/rpcserver.c | 291 ++++++++++++++++++++++++++++++++++++- 1 file changed, 287 insertions(+), 4 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 313ca1c8076..e88d3cc123d 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -410,6 +410,131 @@ IsRootDeviceInstanceID( } +static +CONFIGRET +OpenConfigurationKey( + _In_ LPCWSTR pszDeviceID, + _Out_ PHKEY phKey) +{ + WCHAR szKeyName[MAX_PATH]; + HKEY hInstanceKey; + DWORD dwError; + + /* Build the full device instance key name */ + wcscpy(szKeyName, L"System\\CurrentControlSet\\Enum\\"); + wcscat(szKeyName, pszDeviceID); + + /* Open the device instance key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + szKeyName, + 0, + KEY_QUERY_VALUE | KEY_SET_VALUE | KEY_CREATE_SUB_KEY, + &hInstanceKey); + if (dwError != ERROR_SUCCESS) + return CR_INVALID_DEVINST; + + /* Create or open the LogConf key */ + dwError = RegCreateKeyExW(hInstanceKey, + L"LogConf", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + phKey, + NULL); + + /* Close the device instance key */ + RegCloseKey(hInstanceKey); + + if (dwError != ERROR_SUCCESS) + return CR_REGISTRY_ERROR; + + return CR_SUCCESS; +} + + +static +CONFIGRET +GetConfigurationData( + _In_ HKEY hKey, + _In_ ULONG ulLogConfType, + _Out_ PULONG pulRegDataType, + _Out_ PULONG pulDataSize, + _Out_ LPBYTE *ppBuffer) +{ + LPCWSTR pszValueName; + + switch (ulLogConfType) + { + case BOOT_LOG_CONF: + pszValueName = L"BootConfig"; + *pulRegDataType = REG_RESOURCE_LIST; + break; + + case ALLOC_LOG_CONF: + pszValueName = L"AllocConfig"; + *pulRegDataType = REG_RESOURCE_LIST; + break; + + case FORCED_LOG_CONF: + pszValueName = L"ForcedConfig"; + *pulRegDataType = REG_RESOURCE_LIST; + break; + + case FILTERED_LOG_CONF: + pszValueName = L"FilteredConfigVector"; + *pulRegDataType = REG_RESOURCE_REQUIREMENTS_LIST; + break; + + case BASIC_LOG_CONF: + pszValueName = L"BasicConfigVector"; + *pulRegDataType = REG_RESOURCE_REQUIREMENTS_LIST; + break; + + case OVERRIDE_LOG_CONF: + pszValueName = L"OverrideConfigVector"; + *pulRegDataType = REG_RESOURCE_REQUIREMENTS_LIST; + break; + + default: + DPRINT1("Unsupported configuration type!\n"); + return CR_FAILURE; + } + + /* Get the configuration data size */ + if (RegQueryValueExW(hKey, + pszValueName, + NULL, + NULL, + NULL, + pulDataSize) != ERROR_SUCCESS) + { + return CR_INVALID_LOG_CONF; + } + + /* Allocate the buffer */ + *ppBuffer = HeapAlloc(GetProcessHeap(), 0, *pulDataSize); + if (*ppBuffer == NULL) + { + return CR_OUT_OF_MEMORY; + } + + /* Retrieve the configuration data */ + if (RegQueryValueExW(hKey, + pszValueName, + NULL, + NULL, + (LPBYTE)*ppBuffer, + pulDataSize) != ERROR_SUCCESS) + { + return CR_INVALID_LOG_CONF; + } + + return CR_SUCCESS; +} + + /* PUBLIC FUNCTIONS **********************************************************/ /* Function 0 */ @@ -3732,8 +3857,92 @@ PNP_GetFirstLogConf( DWORD *pulLogConfTag, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + HKEY hConfigKey = NULL; + DWORD RegDataType = 0; + ULONG ulDataSize = 0; + LPBYTE lpData = NULL; + CONFIGRET ret = CR_SUCCESS; + + DPRINT("PNP_GetFirstLogConf(%p %S %lu %p 0x%08lx)\n", + hBinding, pDeviceID, ulLogConfType, pulLogConfTag, ulFlags); + + if (pulLogConfTag == NULL) + return CR_INVALID_POINTER; + + *pulLogConfTag = (DWORD)0; + + if (ulFlags & ~LOG_CONF_BITS) + return CR_INVALID_FLAG; + + if (!IsValidDeviceInstanceID(pDeviceID)) + return CR_INVALID_DEVINST; + + ret = OpenConfigurationKey(pDeviceID, + &hConfigKey); + if (ret != CR_SUCCESS) + { + DPRINT1("OpenConfigurationKey() failed (Error %lu)\n", ret); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + ret = GetConfigurationData(hConfigKey, + ulLogConfType, + &RegDataType, + &ulDataSize, + &lpData); + if (ret != CR_SUCCESS) + { + DPRINT1("GetConfigurationData() failed (Error %lu)\n", ret); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + DPRINT("Data size %lu\n", ulDataSize); + if (ulDataSize == 0 || lpData == NULL) + { + DPRINT1("No config data available!\n"); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + /* Get the first tag */ + if (RegDataType == REG_RESOURCE_LIST) + { + DPRINT("REG_RESOURCE_LIST\n"); + + DPRINT("ResourceList->Count %lu\n", ((PCM_RESOURCE_LIST)lpData)->Count); + if (((PCM_RESOURCE_LIST)lpData)->Count == 0) + { + DPRINT1("No resource descriptors!\n"); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + DPRINT("lpData %p\n", lpData); + DPRINT("&List[0] %p\n", &(((PCM_RESOURCE_LIST)lpData)->List[0])); + + *pulLogConfTag = (DWORD)((DWORD_PTR)&(((PCM_RESOURCE_LIST)lpData)->List[0]) - (DWORD_PTR)lpData); + DPRINT("Offset (Tag): 0x%08lx\n", *pulLogConfTag); + } + else if (RegDataType == REG_RESOURCE_REQUIREMENTS_LIST) + { + DPRINT1("FIXME: REG_RESOURCE_REQUIREMENTS_LIST\n"); + /* FIXME */ + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + +done: + if (lpData != NULL) + HeapFree(GetProcessHeap(), 0, lpData); + + if (hConfigKey != NULL) + RegCloseKey(hConfigKey); + + DPRINT("PNP_GetFirstLogConf() returns %lu\n", ret); + + return ret; } @@ -3748,8 +3957,82 @@ PNP_GetNextLogConf( DWORD *pulNextTag, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + HKEY hConfigKey = NULL; + DWORD RegDataType = 0; + ULONG ulDataSize = 0; + LPBYTE lpData = NULL; + CONFIGRET ret = CR_SUCCESS; + + DPRINT("PNP_GetNextLogConf(%p %S %lu %ul %p 0x%08lx)\n", + hBinding, pDeviceID, ulLogConfType, ulCurrentTag, pulNextTag, ulFlags); + + if (pulNextTag == NULL) + return CR_INVALID_POINTER; + + *pulNextTag = (DWORD)0; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (!IsValidDeviceInstanceID(pDeviceID)) + return CR_INVALID_DEVINST; + + ret = OpenConfigurationKey(pDeviceID, + &hConfigKey); + if (ret != CR_SUCCESS) + { + DPRINT1("OpenConfigurationKey() failed (Error %lu)\n", ret); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + ret = GetConfigurationData(hConfigKey, + ulLogConfType, + &RegDataType, + &ulDataSize, + &lpData); + if (ret != CR_SUCCESS) + { + DPRINT1("GetConfigurationData() failed (Error %lu)\n", ret); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + DPRINT("Data size %lu\n", ulDataSize); + + if (ulDataSize == 0 || lpData == NULL) + { + DPRINT1("No config data available!\n"); + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + + /* FIXME: Get the next tag */ + if (RegDataType == REG_RESOURCE_LIST) + { + DPRINT1("FIXME: REG_RESOURCE_LIST\n"); + /* FIXME */ + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + else if (RegDataType == REG_RESOURCE_REQUIREMENTS_LIST) + { + DPRINT1("FIXME: REG_RESOURCE_REQUIREMENTS_LIST\n"); + /* FIXME */ + ret = CR_NO_MORE_LOG_CONF; + goto done; + } + +done: + if (lpData != NULL) + HeapFree(GetProcessHeap(), 0, lpData); + + if (hConfigKey != NULL) + RegCloseKey(hConfigKey); + + DPRINT("PNP_GetNextLogConf() returns %lu\n", ret); + + return ret; }

1 0

[reactos] 01/01: [FREELDR] Add vertical screen scrolling for Xbox with console mode (#2745)
by Dmitry Borisov 10 May '20

10 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98c17d3120b66c6c95074… commit 98c17d3120b66c6c9507474cb5c3db1ca7b36ed3 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sun May 10 22:35:51 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 10 18:35:51 2020 +0200 [FREELDR] Add vertical screen scrolling for Xbox with console mode (#2745) Also turn off debug messages to screen before setting up the CPU (To print a character to the screen on some ports the MMIO access should be executed, so it throws an exception). CORE-16216 --- boot/freeldr/freeldr/arch/i386/pc98/machpc98.c | 1 + boot/freeldr/freeldr/arch/i386/xbox/machxbox.c | 11 +++++++---- boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c | 18 ++++++++++++++---- boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c | 20 +++++++++++++++++++- boot/freeldr/freeldr/include/arch/i386/machxbox.h | 1 + boot/freeldr/freeldr/include/debug.h | 1 + boot/freeldr/freeldr/lib/debug.c | 6 ++++++ 7 files changed, 49 insertions(+), 9 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c b/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c index ca94ea54976..38ddf378378 100644 --- a/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c +++ b/boot/freeldr/freeldr/arch/i386/pc98/machpc98.c @@ -37,6 +37,7 @@ Pc98PrepareForReactOS(VOID) Pc98DiskPrepareForReactOS(); Pc98VideoPrepareForReactOS(); DiskStopFloppyMotor(); + DebugDisableScreenPort(); } ULONG diff --git a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c index b1ed4c94be0..3735f18982b 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c @@ -277,10 +277,6 @@ MachInit(const char *CmdLine) /* Set LEDs to red before anything is initialized */ XboxSetLED("rrrr"); - /* Initialize our stuff */ - XboxMemInit(); - XboxVideoInit(); - /* Setup vtbl */ MachVtbl.ConsPutChar = XboxConsPutChar; MachVtbl.ConsKbHit = XboxConsKbHit; @@ -311,6 +307,10 @@ MachInit(const char *CmdLine) MachVtbl.HwDetect = XboxHwDetect; MachVtbl.HwIdle = XboxHwIdle; + /* Initialize our stuff */ + XboxMemInit(); + XboxVideoInit(); + /* Set LEDs to orange after init */ XboxSetLED("oooo"); @@ -324,6 +324,9 @@ XboxPrepareForReactOS(VOID) XboxVideoPrepareForReactOS(); XboxDiskInit(FALSE); DiskStopFloppyMotor(); + + /* Turn off debug messages to screen */ + DebugDisableScreenPort(); } /* EOF */ diff --git a/boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c index 8baba25b5cc..ed5d55c5b09 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c @@ -25,7 +25,17 @@ static unsigned CurrentAttr = 0x0f; VOID XboxConsPutChar(int c) { - ULONG Width, Unused; + ULONG Width, Height, Unused; + BOOLEAN NeedScroll; + + XboxVideoGetDisplaySize(&Width, &Height, &Unused); + + NeedScroll = (CurrentCursorY >= Height); + if (NeedScroll) + { + XboxVideoScrollUp(); + --CurrentCursorY; + } if (c == '\r') { @@ -34,7 +44,9 @@ XboxConsPutChar(int c) else if (c == '\n') { CurrentCursorX = 0; - CurrentCursorY++; + + if (!NeedScroll) + ++CurrentCursorY; } else if (c == '\t') { @@ -46,13 +58,11 @@ XboxConsPutChar(int c) CurrentCursorX++; } - XboxVideoGetDisplaySize(&Width, &Unused, &Unused); if (CurrentCursorX >= Width) { CurrentCursorX = 0; CurrentCursorY++; } - // FIXME: Implement vertical screen scrolling if we are at the end of the screen. } BOOLEAN diff --git a/boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c index 261f4550664..0d6e3b2c70b 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c @@ -20,8 +20,8 @@ */ #include <freeldr.h> -#include <debug.h> +#include <debug.h> DBG_DEFAULT_CHANNEL(UI); PVOID FrameBuffer; @@ -101,6 +101,24 @@ XboxVideoClearScreenColor(ULONG Color, BOOLEAN FullScreen) } } +VOID +XboxVideoScrollUp(VOID) +{ + ULONG BgColor, Dummy; + ULONG PixelCount = ScreenWidth * CHAR_HEIGHT * + (((ScreenHeight - 2 * TOP_BOTTOM_LINES) / CHAR_HEIGHT) - 1); + PULONG Src = (PULONG)((PUCHAR)FrameBuffer + (CHAR_HEIGHT + TOP_BOTTOM_LINES) * Delta); + PULONG Dst = (PULONG)((PUCHAR)FrameBuffer + TOP_BOTTOM_LINES * Delta); + + XboxVideoAttrToColors(ATTR(COLOR_WHITE, COLOR_BLACK), &Dummy, &BgColor); + + while (PixelCount--) + *Dst++ = *Src++; + + for (PixelCount = 0; PixelCount < ScreenWidth * CHAR_HEIGHT; PixelCount++) + *Dst++ = BgColor; +} + VOID XboxVideoClearScreen(UCHAR Attr) { diff --git a/boot/freeldr/freeldr/include/arch/i386/machxbox.h b/boot/freeldr/freeldr/include/arch/i386/machxbox.h index 3f41e848666..d4342de4a0f 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machxbox.h +++ b/boot/freeldr/freeldr/include/arch/i386/machxbox.h @@ -69,6 +69,7 @@ VOID XboxVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); VOID XboxVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID XboxVideoSync(VOID); VOID XboxVideoPrepareForReactOS(VOID); +VOID XboxVideoScrollUp(VOID); VOID XboxPrepareForReactOS(VOID); VOID XboxMemInit(VOID); diff --git a/boot/freeldr/freeldr/include/debug.h b/boot/freeldr/freeldr/include/debug.h index 1862220fb82..3ab9392b28e 100644 --- a/boot/freeldr/freeldr/include/debug.h +++ b/boot/freeldr/freeldr/include/debug.h @@ -44,6 +44,7 @@ ULONG DbgPrint(const char *Format, ...); VOID DbgPrint2(ULONG Mask, ULONG Level, const char *File, ULONG Line, char *Format, ...); VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length); + VOID DebugDisableScreenPort(); VOID DbgParseDebugChannels(PCHAR Value); #define ERR_LEVEL 0x1 diff --git a/boot/freeldr/freeldr/lib/debug.c b/boot/freeldr/freeldr/lib/debug.c index abc2545f7ea..e68df9af9cf 100644 --- a/boot/freeldr/freeldr/lib/debug.c +++ b/boot/freeldr/freeldr/lib/debug.c @@ -327,6 +327,12 @@ DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length) } } +VOID +DebugDisableScreenPort(VOID) +{ + DebugPort &= ~SCREEN; +} + static BOOLEAN DbgAddDebugChannel(CHAR* channel, CHAR* level, CHAR op) {

1 0

[reactos] 01/01: [SNDREC32] French translation update (#2761)
by Kyle Katarn 10 May '20

10 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2a24cadaeadcb15afa5f… commit a2a24cadaeadcb15afa5faaab28a9217a2fbe728 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun May 10 18:22:13 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 10 18:22:13 2020 +0200 [SNDREC32] French translation update (#2761) And add/fix colliding keyboard accelerators. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/applications/sndrec32/lang/fr-FR.rc | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/base/applications/sndrec32/lang/fr-FR.rc b/base/applications/sndrec32/lang/fr-FR.rc index 3b37303d23b..b8542d6dbe8 100644 --- a/base/applications/sndrec32/lang/fr-FR.rc +++ b/base/applications/sndrec32/lang/fr-FR.rc @@ -14,50 +14,50 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "Enregistreur de Son ReactOS, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 - DEFPUSHBUTTON "Accepter", IDOK, 139, 54, 50, 14, WS_GROUP + DEFPUSHBUTTON "&Accepter", IDOK, 139, 54, 50, 14, WS_GROUP END IDR_MENU1 MENU BEGIN - POPUP "Fichier" + POPUP "&Fichier" BEGIN - MENUITEM "Nouveau", ID_FILE_NEW - MENUITEM "Ouvrir...", ID_FILE_OPEN - MENUITEM "Enregistrer", ID_FILE_SAVE, GRAYED - MENUITEM "Enregistrer sous...", ID_FILE_SAVEAS, GRAYED - MENUITEM "Restorer...", ID_FILE_RESTORE, GRAYED - MENUITEM "Propriétés", ID_FILE_PROPERTIES + MENUITEM "&Nouveau", ID_FILE_NEW + MENUITEM "&Ouvrir...", ID_FILE_OPEN + MENUITEM "&Enregistrer", ID_FILE_SAVE, GRAYED + MENUITEM "Enregistrer &sous...", ID_FILE_SAVEAS, GRAYED + MENUITEM "&Restaurer...", ID_FILE_RESTORE, GRAYED + MENUITEM "&Propriétés", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Sortir", ID_FILE_EXIT + MENUITEM "&Quitter", ID_FILE_EXIT END POPUP "&Edition" BEGIN - MENUITEM "&Copie", ID_EDIT_COPY - MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED - MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM "&Copier", ID_EDIT_COPY + MENUITEM "Coller &Insérer", ID_EDIT_PASTE, GRAYED + MENUITEM "Coller &Mélanger", ID_EDIT_PASTEMIX, GRAYED MENUITEM SEPARATOR - MENUITEM "&Insérer un fichier...", ID_EDIT_INSERTFILE - MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM "Insérer un &fichier...", ID_EDIT_INSERTFILE + MENUITEM "Mé&langer avec un fichier...", ID_EDIT_MIXFILE MENUITEM SEPARATOR - MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED - MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM "Supprimer &avant la position actuelle",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Supprimer a&près la position actuelle",ID_EDIT_DELETEAFTER, GRAYED MENUITEM SEPARATOR MENUITEM "Propriétés A&udio", ID_EDIT_AUDIOPROPS END POPUP "Effet&s" BEGIN - MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL - MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM "&Augmenter le volume (de 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Réduire le volume", ID_EFFECTS_DECVOL MENUITEM SEPARATOR - MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD - MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM "Aug&menter la vitesse (de 100%)", ID_EFFECTS_INCSPD + MENUITEM "Réd&uire la vitesse", ID_EFFECTS_DECSPD MENUITEM SEPARATOR - MENUITEM "&Add Echo", ID_EFFECTS_ECHO - MENUITEM "&Reverse", ID_EFFECTS_REVERSE + MENUITEM "Aj&outer de l'écho", ID_EFFECTS_ECHO + MENUITEM "&Inverser", ID_EFFECTS_REVERSE END - POPUP "?" + POPUP "&?" BEGIN - MENUITEM "À propos", ID_ABOUT + MENUITEM "À &propos", ID_ABOUT END END @@ -71,7 +71,7 @@ STRINGTABLE BEGIN IDS_STRPOS "Position: %.2f s" IDS_STRDUR "Durée : %.2f s" - IDS_STRBUF "Buffer: %.2f kb" + IDS_STRBUF "Buffer: %.2f Ko" IDS_STRFMT "%.1f kHz %u bits" IDS_STRMONO "mono" IDS_STRSTEREO "stéréo"

1 0

[reactos] 01/01: [ARP] Print a message when there is no relevant entry to be shown
by Eric Kohl 10 May '20

10 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=592bafd60a33b82e62174… commit 592bafd60a33b82e62174f124ce80b2e0374a03a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 10 09:04:50 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 10 09:05:52 2020 +0200 [ARP] Print a message when there is no relevant entry to be shown --- base/applications/network/arp/arp.c | 43 +++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/base/applications/network/arp/arp.c b/base/applications/network/arp/arp.c index 2be34b24032..f3e758a0095 100644 --- a/base/applications/network/arp/arp.c +++ b/base/applications/network/arp/arp.c @@ -199,7 +199,7 @@ DWORD PrintEntries(PMIB_IPNETROW pIpAddRow) /* FIXME: allow user to specify an interface address, via pszIfAddr */ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) { - UINT i, k; + DWORD i, k, dwCount; PMIB_IPNETTABLE pIpNetTable = NULL; PMIB_IPADDRTABLE pIpAddrTable = NULL; ULONG Size = 0; @@ -227,7 +227,7 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) dwError = GetIpNetTable(pIpNetTable, &Size, TRUE); if (dwError != NO_ERROR) { - _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + _tprintf(_T("GetIpNetTable failed: %lu\n"), dwError); DoFormatMessage(); goto cleanup; } @@ -246,7 +246,7 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) Size = 0; GetIpAddrTable(pIpAddrTable, &Size, 0); - pIpAddrTable = (MIB_IPADDRTABLE *)HeapAlloc(GetProcessHeap(), 0, Size); + pIpAddrTable = (PMIB_IPADDRTABLE)HeapAlloc(GetProcessHeap(), 0, Size); if (pIpAddrTable == NULL) { PrintMessage(10004); @@ -275,6 +275,34 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) } } + /* Count relevant ARP entries */ + dwCount = 0; + for (i = 0; i < pIpNetTable->dwNumEntries; i++) + { + /* if the user has supplied their own internet address * + * only count the arp entry which matches that */ + if (pszInetAddr) + { + inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr; + pszIpAddr = inet_ntoa(inaddr); + + /* check if it matches, count it */ + if (strcmp(pszIpAddr, pszInetAddr) == 0) + dwCount++; + } + else + { + /* if an address is not supplied, count all entries */ + dwCount++; + } + } + + /* Print message and leave if there are no relevant ARP entries */ + if (dwCount == 0) + { + PrintMessage(10018); + goto cleanup; + } /* print header, including interface IP address and index number */ PrintMessageV(10003, szIntIpAddr, pIpNetTable->table[0].dwIndex); @@ -378,13 +406,13 @@ DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) dwError = GetIpNetTable(pIpNetTable, &Size, TRUE); if (dwError != NO_ERROR) { - _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + _tprintf(_T("GetIpNetTable failed: %lu\n"), dwError); DoFormatMessage(); goto cleanup; } /* reserve memory on heap and zero */ - pAddHost = (MIB_IPNETROW *)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); + pAddHost = (PMIB_IPNETROW)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); if (pAddHost == NULL) { PrintMessage(10004); @@ -438,7 +466,8 @@ DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) /* Add the ARP entry */ - if (SetIpNetEntry(pAddHost) != NO_ERROR) + dwError = SetIpNetEntry(pAddHost); + if (dwError != NO_ERROR) { DoFormatMessage(); goto cleanup; @@ -512,7 +541,7 @@ DWORD Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) dwError = GetIpNetTable(pIpNetTable, &Size, TRUE); if (dwError != NO_ERROR) { - _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + _tprintf(_T("GetIpNetTable failed: %lu\n"), dwError); DoFormatMessage(); goto cleanup; }

1 0

[reactos] 01/01: [WINNLS] Fix of GetCurrencyFormatW to handle "32" grouping format (#2719)
by Kyle Katarn 10 May '20

10 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1fad34755ccf07663f0d… commit c1fad34755ccf07663f0d962be5f207491eb244a Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun May 10 08:34:35 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 10 08:34:35 2020 +0200 [WINNLS] Fix of GetCurrencyFormatW to handle "32" grouping format (#2719) --- dll/win32/kernel32/winnls/string/lcformat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/win32/kernel32/winnls/string/lcformat.c b/dll/win32/kernel32/winnls/string/lcformat.c index 441c41b2211..5e5b529df9e 100644 --- a/dll/win32/kernel32/winnls/string/lcformat.c +++ b/dll/win32/kernel32/winnls/string/lcformat.c @@ -1762,7 +1762,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, *szOut-- = *lpszDec--; /* Write decimal separator */ } - dwGroupCount = lpFormat->Grouping; + dwGroupCount = lpFormat->Grouping == 32 ? 3 : lpFormat->Grouping; /* Write the remaining whole number digits, including grouping chars */ while (szSrc >= lpszValue && *szSrc >= '0' && *szSrc <= '9') @@ -1791,6 +1791,8 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, *szOut-- = *lpszGrp--; /* Write grouping char */ dwCurrentGroupCount = 0; + if (lpFormat->Grouping == 32) + dwGroupCount = 2; /* Indic grouping: 3 then 2 */ } } if (dwState & NF_ROUND)

1 0

[reactos] 01/01: [ARP] Coding style fixes only
by Eric Kohl 10 May '20

10 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ebde7139a7c58592e96f… commit 5ebde7139a7c58592e96fed9fa26a39db094e82a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 10 08:24:10 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 10 08:24:10 2020 +0200 [ARP] Coding style fixes only --- base/applications/network/arp/arp.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/base/applications/network/arp/arp.c b/base/applications/network/arp/arp.c index f185f7858bb..2be34b24032 100644 --- a/base/applications/network/arp/arp.c +++ b/base/applications/network/arp/arp.c @@ -214,7 +214,7 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) GetIpNetTable(pIpNetTable, &Size, 0); /* allocate memory for ARP address table */ - pIpNetTable = (PMIB_IPNETTABLE) HeapAlloc(GetProcessHeap(), 0, Size); + pIpNetTable = (PMIB_IPNETTABLE)HeapAlloc(GetProcessHeap(), 0, Size); if (pIpNetTable == NULL) { PrintMessage(10004); @@ -239,8 +239,6 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) goto cleanup; } - - /* Retrieve the interface-to-ip address mapping * table to get the IP address for adapter */ @@ -248,7 +246,7 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) Size = 0; GetIpAddrTable(pIpAddrTable, &Size, 0); - pIpAddrTable = (MIB_IPADDRTABLE *) HeapAlloc(GetProcessHeap(), 0, Size); + pIpAddrTable = (MIB_IPADDRTABLE *)HeapAlloc(GetProcessHeap(), 0, Size); if (pIpAddrTable == NULL) { PrintMessage(10004); @@ -266,8 +264,7 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) goto cleanup; } - - for (k=0; k < pIpAddrTable->dwNumEntries; k++) + for (k = 0; k < pIpAddrTable->dwNumEntries; k++) { if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex) { @@ -283,7 +280,7 @@ DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) PrintMessageV(10003, szIntIpAddr, pIpNetTable->table[0].dwIndex); /* go through all ARP entries */ - for (i=0; i < pIpNetTable->dwNumEntries; i++) + for (i = 0; i < pIpNetTable->dwNumEntries; i++) { /* if the user has supplied their own internet address * @@ -350,7 +347,8 @@ DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) PrintMessageV(10002, pszEthAddr); return ERROR_INVALID_PARAMETER; } - for (i=0; i<17; i++) + + for (i = 0; i < 17; i++) { if (pszEthAddr[i] == SEPARATOR) continue; @@ -367,7 +365,7 @@ DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) GetIpNetTable(pIpNetTable, &Size, 0); /* allocate memory for ARP address table */ - pIpNetTable = (PMIB_IPNETTABLE) HeapAlloc(GetProcessHeap(), 0, Size); + pIpNetTable = (PMIB_IPNETTABLE)HeapAlloc(GetProcessHeap(), 0, Size); if (pIpNetTable == NULL) { PrintMessage(10004); @@ -385,9 +383,8 @@ DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) goto cleanup; } - /* reserve memory on heap and zero */ - pAddHost = (MIB_IPNETROW *) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); + pAddHost = (MIB_IPNETROW *)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); if (pAddHost == NULL) { PrintMessage(10004); @@ -419,20 +416,19 @@ DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) /* Encode bPhysAddr into correct byte array */ - for (i=0; i<6; i++) + for (i = 0; i < 6; i++) { - val =0; - c = toupper(pszEthAddr[i*3]); + val = 0; + c = toupper(pszEthAddr[i * 3]); c = c - (isdigit(c) ? '0' : ('A' - 10)); val += c; val = (val << 4); - c = toupper(pszEthAddr[i*3 + 1]); + c = toupper(pszEthAddr[i * 3 + 1]); c = c - (isdigit(c) ? '0' : ('A' - 10)); val += c; pAddHost->bPhysAddr[i] = (BYTE)val; } - /* copy converted IP address */ pAddHost->dwAddr = dwIpAddr; @@ -522,7 +518,7 @@ DWORD Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) } /* reserve memory on heap and zero */ - pDelHost = (MIB_IPNETROW *) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); + pDelHost = (MIB_IPNETROW *)HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); if (pDelHost == NULL) { PrintMessage(10004); @@ -532,7 +528,6 @@ DWORD Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) ZeroMemory(pDelHost, sizeof(MIB_IPNETROW)); - /* set dwIndex field to the index of a local IP address to * indicate the network on which the ARP entry applies */ if (pszIfAddr)

1 0

[reactos] 01/01: [ARP] Improvements to ARP
by Eric Kohl 09 May '20

09 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e31069738fb9a1611a417… commit e31069738fb9a1611a417d8070f4ba19c3117e8a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 10 00:46:42 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 10 00:46:42 2020 +0200 [ARP] Improvements to ARP - Print message on failed memory allocations. - Functions return error code instead of exit code. - Convert error code to exit code in the main function only. - Always free the allocated memory. - Fix bug from previous commit: Use _tprintf instead _putts to print messages. --- base/applications/network/arp/arp.c | 255 ++++++++++++++++++++---------------- sdk/include/reactos/mc/arp_msg.mc | 8 ++ 2 files changed, 153 insertions(+), 110 deletions(-) diff --git a/base/applications/network/arp/arp.c b/base/applications/network/arp/arp.c index 5df10ed4f93..f185f7858bb 100644 --- a/base/applications/network/arp/arp.c +++ b/base/applications/network/arp/arp.c @@ -49,10 +49,10 @@ int _CRT_glob = 0; // stop * from listing dir files in arp -d * * function declarations */ DWORD DoFormatMessage(VOID); -INT PrintEntries(PMIB_IPNETROW pIpAddRow); -INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr); -INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr); -INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr); +DWORD PrintEntries(PMIB_IPNETROW pIpAddRow); +DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr); +DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr); +DWORD Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr); VOID Usage(VOID); /* @@ -79,7 +79,7 @@ DWORD DoFormatMessage(VOID) if (RetVal != 0) { - _putts(lpMsgBuf); + _tprintf(_T("%s"), lpMsgBuf); LocalFree(lpMsgBuf); /* return number of TCHAR's stored in output buffer * excluding '\0' - as FormatMessage does*/ @@ -107,7 +107,7 @@ PrintMessage( NULL); if (RetVal != 0) { - _putts(lpMsgBuf); + _tprintf(_T("%s"), lpMsgBuf); LocalFree(lpMsgBuf); } } @@ -134,7 +134,7 @@ PrintMessageV( if (RetVal != 0) { - _putts(lpMsgBuf); + _tprintf(_T("%s"), lpMsgBuf); LocalFree(lpMsgBuf); } } @@ -145,7 +145,7 @@ PrintMessageV( * the MAC address and the entry type to screen * */ -INT PrintEntries(PMIB_IPNETROW pIpAddRow) +DWORD PrintEntries(PMIB_IPNETROW pIpAddRow) { IN_ADDR inaddr; TCHAR cMacAddr[20]; @@ -183,7 +183,8 @@ INT PrintEntries(PMIB_IPNETROW pIpAddRow) PrintMessage(10005); break; } - return EXIT_SUCCESS; + _putts(_T("")); + return NO_ERROR; } /* @@ -196,9 +197,8 @@ INT PrintEntries(PMIB_IPNETROW pIpAddRow) * */ /* FIXME: allow user to specify an interface address, via pszIfAddr */ -INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) +DWORD DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) { - INT iRet; UINT i, k; PMIB_IPNETTABLE pIpNetTable = NULL; PMIB_IPADDRTABLE pIpAddrTable = NULL; @@ -206,6 +206,7 @@ INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) struct in_addr inaddr, inaddr2; PTCHAR pszIpAddr; TCHAR szIntIpAddr[20]; + DWORD dwError = NO_ERROR; /* retrieve the IP-to-physical address mapping table */ @@ -215,11 +216,16 @@ INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) /* allocate memory for ARP address table */ pIpNetTable = (PMIB_IPNETTABLE) HeapAlloc(GetProcessHeap(), 0, Size); if (pIpNetTable == NULL) + { + PrintMessage(10004); + dwError = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; + } ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); - if (GetIpNetTable(pIpNetTable, &Size, TRUE) != NO_ERROR) + dwError = GetIpNetTable(pIpNetTable, &Size, TRUE); + if (dwError != NO_ERROR) { _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); DoFormatMessage(); @@ -244,13 +250,18 @@ INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) pIpAddrTable = (MIB_IPADDRTABLE *) HeapAlloc(GetProcessHeap(), 0, Size); if (pIpAddrTable == NULL) + { + PrintMessage(10004); + dwError = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; + } ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable)); - if ((iRet = GetIpAddrTable(pIpAddrTable, &Size, TRUE)) != NO_ERROR) + dwError = GetIpAddrTable(pIpAddrTable, &Size, TRUE); + if (dwError != NO_ERROR) { - _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); + _tprintf(_T("GetIpAddrTable failed: %lu\n"), dwError); DoFormatMessage(); goto cleanup; } @@ -291,14 +302,13 @@ INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) PrintEntries(&pIpNetTable->table[i]); } - return EXIT_SUCCESS; - cleanup: if (pIpNetTable != NULL) HeapFree(GetProcessHeap(), 0, pIpNetTable); if (pIpAddrTable != NULL) HeapFree(GetProcessHeap(), 0, pIpAddrTable); - return EXIT_FAILURE; + + return dwError; } /* @@ -309,36 +319,36 @@ cleanup: * ARP cache as a static entry. * */ -INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) +DWORD Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) { PMIB_IPNETROW pAddHost = NULL; PMIB_IPNETTABLE pIpNetTable = NULL; DWORD dwIpAddr = 0; ULONG Size = 0; INT i, val, c; + DWORD dwError = NO_ERROR; /* error checking */ /* check IP address */ - if (pszInetAddr != NULL) + if (pszInetAddr == NULL) { - if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) - { - PrintMessageV(10001, pszInetAddr); - return EXIT_FAILURE; - } + Usage(); + return ERROR_INVALID_PARAMETER; } - else + + dwIpAddr = inet_addr(pszInetAddr); + if (dwIpAddr == INADDR_NONE) { - Usage(); - return EXIT_FAILURE; + PrintMessageV(10001, pszInetAddr); + return ERROR_INVALID_PARAMETER; } /* check MAC address */ if (strlen(pszEthAddr) != 17) { PrintMessageV(10002, pszEthAddr); - return EXIT_FAILURE; + return ERROR_INVALID_PARAMETER; } for (i=0; i<17; i++) { @@ -348,7 +358,7 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) if (!isxdigit(pszEthAddr[i])) { PrintMessageV(10002, pszEthAddr); - return EXIT_FAILURE; + return ERROR_INVALID_PARAMETER; } } @@ -359,11 +369,16 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) /* allocate memory for ARP address table */ pIpNetTable = (PMIB_IPNETTABLE) HeapAlloc(GetProcessHeap(), 0, Size); if (pIpNetTable == NULL) + { + PrintMessage(10004); + dwError = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; + } ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); - if (GetIpNetTable(pIpNetTable, &Size, TRUE) != NO_ERROR) + dwError = GetIpNetTable(pIpNetTable, &Size, TRUE); + if (dwError != NO_ERROR) { _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); DoFormatMessage(); @@ -374,7 +389,11 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) /* reserve memory on heap and zero */ pAddHost = (MIB_IPNETROW *) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); if (pAddHost == NULL) + { + PrintMessage(10004); + dwError = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; + } ZeroMemory(pAddHost, sizeof(MIB_IPNETROW)); @@ -429,16 +448,13 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) goto cleanup; } - HeapFree(GetProcessHeap(), 0, pAddHost); - - return EXIT_SUCCESS; - cleanup: if (pIpNetTable != NULL) HeapFree(GetProcessHeap(), 0, pIpNetTable); if (pAddHost != NULL) HeapFree(GetProcessHeap(), 0, pAddHost); - return EXIT_FAILURE; + + return dwError; } /* @@ -449,32 +465,37 @@ cleanup: * and remove the entry from the ARP cache. * */ -INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) +DWORD Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) { PMIB_IPNETROW pDelHost = NULL; PMIB_IPNETTABLE pIpNetTable = NULL; ULONG Size = 0; DWORD dwIpAddr = 0; BOOL bFlushTable = FALSE; + DWORD dwError = NO_ERROR; /* error checking */ /* check IP address */ - if (pszInetAddr != NULL) + if (pszInetAddr == NULL) { - /* if wildcard is given, set flag to delete all hosts */ - if (strncmp(pszInetAddr, "*", 1) == 0) - bFlushTable = TRUE; - else if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) - { - PrintMessageV(10001, pszInetAddr); - exit(EXIT_FAILURE); - } + Usage(); + return ERROR_INVALID_PARAMETER; + } + + /* if wildcard is given, set flag to delete all hosts */ + if (strncmp(pszInetAddr, "*", 1) == 0) + { + bFlushTable = TRUE; } else { - Usage(); - exit(EXIT_FAILURE); + dwIpAddr = inet_addr(pszInetAddr); + if (dwIpAddr == INADDR_NONE) + { + PrintMessageV(10001, pszInetAddr); + return ERROR_INVALID_PARAMETER; + } } /* We need the IpNetTable to get the adapter index */ @@ -484,11 +505,16 @@ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) /* allocate memory for ARP address table */ pIpNetTable = (PMIB_IPNETTABLE) HeapAlloc(GetProcessHeap(), 0, Size); if (pIpNetTable == NULL) + { + PrintMessage(10004); + dwError = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; + } ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); - if (GetIpNetTable(pIpNetTable, &Size, TRUE) != NO_ERROR) + dwError = GetIpNetTable(pIpNetTable, &Size, TRUE); + if (dwError != NO_ERROR) { _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); DoFormatMessage(); @@ -498,7 +524,11 @@ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) /* reserve memory on heap and zero */ pDelHost = (MIB_IPNETROW *) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); if (pDelHost == NULL) + { + PrintMessage(10004); + dwError = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; + } ZeroMemory(pDelHost, sizeof(MIB_IPNETROW)); @@ -522,38 +552,34 @@ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) if (bFlushTable != FALSE) { /* delete arp cache */ - if (FlushIpNetTable(pDelHost->dwIndex) != NO_ERROR) + dwError = FlushIpNetTable(pDelHost->dwIndex); + if (dwError != NO_ERROR) { DoFormatMessage(); goto cleanup; } - else - { - HeapFree(GetProcessHeap(), 0, pDelHost); - return EXIT_SUCCESS; - } } else + { /* copy converted IP address */ pDelHost->dwAddr = dwIpAddr; - /* Add the ARP entry */ - if (DeleteIpNetEntry(pDelHost) != NO_ERROR) - { - DoFormatMessage(); - goto cleanup; + /* Delete the ARP entry */ + dwError = DeleteIpNetEntry(pDelHost); + if (dwError != NO_ERROR) + { + DoFormatMessage(); + goto cleanup; + } } - HeapFree(GetProcessHeap(), 0, pDelHost); - - return EXIT_SUCCESS; - cleanup: if (pIpNetTable != NULL) HeapFree(GetProcessHeap(), 0, pIpNetTable); if (pDelHost != NULL) HeapFree(GetProcessHeap(), 0, pDelHost); - return EXIT_FAILURE; + + return dwError; } /* @@ -574,59 +600,68 @@ VOID Usage(VOID) */ INT main(int argc, char* argv[]) { + DWORD dwError = NO_ERROR; + if ((argc < 2) || (argc > 5)) { Usage(); return EXIT_FAILURE; } - if (argv[1][0] == '-') + if (argv[1][0] != '-') { - switch (argv[1][1]) - { - case 'a': /* fall through */ - case 'g': - if (argc == 2) - DisplayArpEntries(NULL, NULL); - else if (argc == 3) - DisplayArpEntries(argv[2], NULL); - else if ((argc == 4) && ((strcmp(argv[2], "-N")) == 0)) - DisplayArpEntries(NULL, argv[3]); - else if ((argc == 5) && ((strcmp(argv[3], "-N")) == 0)) - DisplayArpEntries(argv[2], argv[4]); - else - { - Usage(); - return EXIT_FAILURE; - } - break; - case 'd': if (argc == 3) - Deletehost(argv[2], NULL); - else if (argc == 4) - Deletehost(argv[2], argv[3]); - else - { - Usage(); - return EXIT_FAILURE; - } - break; - case 's': if (argc == 4) - Addhost(argv[2], argv[3], NULL); - else if (argc == 5) - Addhost(argv[2], argv[3], argv[4]); - else - { - Usage(); - return EXIT_FAILURE; - } - break; - default: - Usage(); - return EXIT_FAILURE; - } - } - else Usage(); + return EXIT_SUCCESS; + } + + switch (argv[1][1]) + { + case 'a': /* fall through */ + case 'g': + if (argc == 2) + dwError = DisplayArpEntries(NULL, NULL); + else if (argc == 3) + dwError = DisplayArpEntries(argv[2], NULL); + else if ((argc == 4) && ((strcmp(argv[2], "-N")) == 0)) + dwError = DisplayArpEntries(NULL, argv[3]); + else if ((argc == 5) && ((strcmp(argv[3], "-N")) == 0)) + dwError = DisplayArpEntries(argv[2], argv[4]); + else + { + Usage(); + dwError = ERROR_INVALID_PARAMETER; + } + break; + + case 'd': + if (argc == 3) + dwError = Deletehost(argv[2], NULL); + else if (argc == 4) + dwError = Deletehost(argv[2], argv[3]); + else + { + Usage(); + dwError = ERROR_INVALID_PARAMETER; + } + break; + + case 's': + if (argc == 4) + dwError = Addhost(argv[2], argv[3], NULL); + else if (argc == 5) + dwError = Addhost(argv[2], argv[3], argv[4]); + else + { + Usage(); + dwError = ERROR_INVALID_PARAMETER; + } + break; + + default: + Usage(); + dwError = ERROR_INVALID_PARAMETER; + break; + } - return EXIT_SUCCESS; + return (dwError == NO_ERROR) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/sdk/include/reactos/mc/arp_msg.mc b/sdk/include/reactos/mc/arp_msg.mc index 15aa4095cf1..a573c300440 100644 --- a/sdk/include/reactos/mc/arp_msg.mc +++ b/sdk/include/reactos/mc/arp_msg.mc @@ -74,6 +74,14 @@ Interface: %1!s! --- 0x%2!lx! Internet Address Physical Address Type . +MessageId=10004 +SymbolicName=MSG_ARP_NO_MEMORY +Severity=Success +Facility=System +Language=English +ARP: not enough memory +. + MessageId=10005 SymbolicName=MSG_ARP_OTHER Severity=Success

1 0

[reactos] 01/01: [ISAPNP] Mark Read Data Port as not having a unique ID
by Hervé Poussineau 09 May '20

09 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc0a0b9f84e1f284914b4… commit fc0a0b9f84e1f284914b4576305cbf11c9015ad6 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat May 9 16:53:00 2020 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat May 9 16:54:46 2020 +0200 [ISAPNP] Mark Read Data Port as not having a unique ID This fixes a bugcheck in ntoskrnl.exe when computer has multiple ISA buses. CORE-17034 --- drivers/bus/isapnp/pdo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 6651cc54710..87eea2d9012 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -64,7 +64,7 @@ IsaPdoQueryCapabilities( } else { - DeviceCapabilities->UniqueID = TRUE; + DeviceCapabilities->UniqueID = FALSE; DeviceCapabilities->RawDeviceOK = TRUE; DeviceCapabilities->SilentInstall = TRUE; }

1 0

[reactos] 01/01: [SHELL32] Return ERROR_INVALID_DRIVE if the drive type is unknown or there is no volume mounted (#2703)
by Charles Ambrye 09 May '20

09 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e978ec612537ce0ffaec0… commit e978ec612537ce0ffaec05eef85e8ef4c9457a0d Author: Charles Ambrye <giawa(a)hotmail.com> AuthorDate: Sat May 9 05:54:15 2020 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sat May 9 21:54:15 2020 +0900 [SHELL32] Return ERROR_INVALID_DRIVE if the drive type is unknown or there is no volume mounted (#2703) Return ERROR_INVALID_DRIVE if the drive is either unknown or unmounted. --- dll/win32/shell32/folders/CDrivesFolder.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 482225ab607..d7246a459bb 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -582,6 +582,7 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST HRESULT hr = E_INVALIDARG; LPCWSTR szNext = NULL; LPITEMIDLIST pidlTemp = NULL; + WCHAR volumePathName[MAX_PATH]; TRACE("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", this, hwndOwner, pbc, lpszDisplayName, debugstr_w (lpszDisplayName), @@ -598,6 +599,13 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST if (PathGetDriveNumberW(lpszDisplayName) < 0) return E_INVALIDARG; + /* check if this drive actually exists */ + if (!GetVolumePathNameW(lpszDisplayName, volumePathName, _countof(volumePathName)) || + GetDriveTypeW(volumePathName) < DRIVE_REMOVABLE) + { + return HRESULT_FROM_WIN32(ERROR_INVALID_DRIVE); + } + pidlTemp = _ILCreateDrive(lpszDisplayName); if (!pidlTemp) return E_OUTOFMEMORY;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs