Ros-diffs May 2020

ros-diffs@reactos.org

28 participants
193 discussions

[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

[reactos] 01/01: [COMDLG32] Add some more places to the places bar in the open file dialog. (#2732)
by Jared Smudde 09 May '20

09 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2fdfae24fdfc166810fe… commit e2fdfae24fdfc166810fe2d06404bfc3d9b6bf57 Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Sat May 9 07:50:20 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sat May 9 21:50:20 2020 +0900 [COMDLG32] Add some more places to the places bar in the open file dialog. (#2732) Add Recent Documents and My Network Places to the places bar in the open file dialog. NOTE: Technically this "places bar" can be customized: https://www.tenforums.com/tutorials/126153-change-places-bar-items-common-d… https://www.sevenforums.com/tutorials/85487-common-file-dialog-box-customiz… --- dll/win32/comdlg32/filedlg.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index 1847d837c09..af3c5c4a3ac 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -305,9 +305,17 @@ static void filedlg_collect_places_pidls(FileOpenDlgInfos *fodInfos) { static const int default_places[] = { +#ifdef __REACTOS__ + CSIDL_RECENT, CSIDL_DESKTOP, CSIDL_MYDOCUMENTS, CSIDL_DRIVES, + CSIDL_NETWORK, +#else + CSIDL_DESKTOP, + CSIDL_MYDOCUMENTS, + CSIDL_DRIVES, +#endif }; unsigned int i; HKEY hkey;

1 0

[reactos] 01/01: Fix of comdlg32 Treeview undue handling of WM_SYSKEYDOWN (#2731)
by Kyle Katarn 09 May '20

09 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=295ba62820a1cdad86eba… commit 295ba62820a1cdad86ebadc4d8a2d20c799a08d4 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat May 9 14:37:26 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat May 9 21:37:26 2020 +0900 Fix of comdlg32 Treeview undue handling of WM_SYSKEYDOWN (#2731) Remove WM_SYSKEYDOWN handling at component level, in consistency with other components (ListView,...) Early embodiement of the fix proposed to WineHQ : https://bugs.winehq.org/show_bug.cgi?id=49097 in order to remove functionnal limitation in ReactOS. CORE-17020 --- dll/win32/comctl32/treeview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/comctl32/treeview.c b/dll/win32/comctl32/treeview.c index 9e5eb43894f..e4a30d38103 100644 --- a/dll/win32/comctl32/treeview.c +++ b/dll/win32/comctl32/treeview.c @@ -5825,7 +5825,9 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_HScroll(infoPtr, wParam); case WM_KEYDOWN: +#ifndef __REACTOS__ case WM_SYSKEYDOWN: +#endif return TREEVIEW_KeyDown(infoPtr, wParam); case WM_KILLFOCUS:

1 0

[reactos] 01/01: [SNDREC32] Fix incorrect opaque text rendering (#2760)
by Kyle Katarn 09 May '20

09 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d839e3d9b491cf39de04a… commit d839e3d9b491cf39de04a483f016064bfcf0d854 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat May 9 14:09:58 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat May 9 21:09:58 2020 +0900 [SNDREC32] Fix incorrect opaque text rendering (#2760) Remove "Opaque" parameter so that the transparency can be correctly used. --- base/applications/sndrec32/sndrec32.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/applications/sndrec32/sndrec32.cpp b/base/applications/sndrec32/sndrec32.cpp index 18bf8f37d1a..450179a8386 100644 --- a/base/applications/sndrec32/sndrec32.cpp +++ b/base/applications/sndrec32/sndrec32.cpp @@ -820,7 +820,7 @@ WndProc(HWND hWnd, ExtTextOut(hdc, STRPOS_X, STRPOS_Y, - ETO_OPAQUE, + 0, 0, str_tmp, _tcslen(str_tmp), @@ -844,7 +844,7 @@ WndProc(HWND hWnd, ExtTextOut(hdc, STRDUR_X, STRDUR_Y, - ETO_OPAQUE, + 0, 0, str_tmp, _tcslen(str_tmp), @@ -858,7 +858,7 @@ WndProc(HWND hWnd, ExtTextOut(hdc, STRBUF_X, STRBUF_Y, - ETO_OPAQUE, + 0, 0, str_tmp, _tcslen(str_tmp), @@ -874,7 +874,7 @@ WndProc(HWND hWnd, ExtTextOut(hdc, STRFMT_X, STRFMT_Y, - ETO_OPAQUE, + 0, 0, str_tmp, _tcslen(str_tmp), @@ -888,7 +888,7 @@ WndProc(HWND hWnd, ExtTextOut(hdc, STRCHAN_X, STRCHAN_Y, - ETO_OPAQUE, + 0, 0, str_tmp, _tcslen(str_tmp),

1 0

[reactos] 01/01: [ARP] Replace some hard-coded strings by message resources
by Eric Kohl 09 May '20

09 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac01e4cd72ffc3f0e2cdf… commit ac01e4cd72ffc3f0e2cdfe03e306ab2b5d6a2cfd Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 9 12:28:40 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 9 12:30:11 2020 +0200 [ARP] Replace some hard-coded strings by message resources --- base/applications/network/arp/CMakeLists.txt | 1 + base/applications/network/arp/arp.c | 121 ++++++++++++++++---------- base/applications/network/arp/arp.rc | 1 + sdk/include/reactos/mc/CMakeLists.txt | 1 + sdk/include/reactos/mc/arp_msg.mc | 123 +++++++++++++++++++++++++++ 5 files changed, 200 insertions(+), 47 deletions(-) diff --git a/base/applications/network/arp/CMakeLists.txt b/base/applications/network/arp/CMakeLists.txt index 7f86c4cb4ba..6aba57385c9 100644 --- a/base/applications/network/arp/CMakeLists.txt +++ b/base/applications/network/arp/CMakeLists.txt @@ -1,5 +1,6 @@ add_executable(arp arp.c arp.rc) set_module_type(arp win32cui) +add_dependencies(arp arp_msg) add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32) add_cd_file(TARGET arp DESTINATION reactos/system32 FOR all) diff --git a/base/applications/network/arp/arp.c b/base/applications/network/arp/arp.c index 4c9322119a6..5df10ed4f93 100644 --- a/base/applications/network/arp/arp.c +++ b/base/applications/network/arp/arp.c @@ -60,7 +60,7 @@ VOID Usage(VOID); */ DWORD DoFormatMessage(VOID) { - LPVOID lpMsgBuf; + LPTSTR lpMsgBuf; DWORD RetVal; DWORD ErrorCode = GetLastError(); @@ -79,8 +79,7 @@ DWORD DoFormatMessage(VOID) if (RetVal != 0) { - _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); - + _putts(lpMsgBuf); LocalFree(lpMsgBuf); /* return number of TCHAR's stored in output buffer * excluding '\0' - as FormatMessage does*/ @@ -90,6 +89,56 @@ DWORD DoFormatMessage(VOID) return 0; } +VOID +PrintMessage( + DWORD dwMessage) +{ + LPTSTR lpMsgBuf; + DWORD RetVal; + + RetVal = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_IGNORE_INSERTS, + GetModuleHandleW(NULL), + dwMessage, + LANG_USER_DEFAULT, + (LPTSTR)&lpMsgBuf, + 0, + NULL); + if (RetVal != 0) + { + _putts(lpMsgBuf); + LocalFree(lpMsgBuf); + } +} + +VOID +PrintMessageV( + DWORD dwMessage, + ...) +{ + LPTSTR lpMsgBuf; + va_list args = NULL; + DWORD RetVal; + + va_start(args, dwMessage); + + RetVal = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE, + GetModuleHandleW(NULL), + dwMessage, + LANG_USER_DEFAULT, + (LPTSTR)&lpMsgBuf, + 0, + &args); + va_end(args); + + if (RetVal != 0) + { + _putts(lpMsgBuf); + LocalFree(lpMsgBuf); + } +} + /* * * Takes an ARP entry and prints the IP address, @@ -118,14 +167,21 @@ INT PrintEntries(PMIB_IPNETROW pIpAddRow) /* print cache type */ switch (pIpAddRow->dwType) { - case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n")); - break; - case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n")); - break; - case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n")); - break; - case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n")); - break; + case MIB_IPNET_TYPE_DYNAMIC: + PrintMessage(10007); + break; + + case MIB_IPNET_TYPE_STATIC: + PrintMessage(10008); + break; + + case MIB_IPNET_TYPE_INVALID: + PrintMessage(10006); + break; + + case MIB_IPNET_TYPE_OTHER: + PrintMessage(10005); + break; } return EXIT_SUCCESS; } @@ -173,7 +229,7 @@ INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) /* check there are entries in the table */ if (pIpNetTable->dwNumEntries == 0) { - _tprintf(_T("No ARP entires found\n")); + PrintMessage(10018); goto cleanup; } @@ -213,8 +269,7 @@ INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) /* print header, including interface IP address and index number */ - _tprintf(_T("\nInterface: %s --- 0x%lx \n"), szIntIpAddr, pIpNetTable->table[0].dwIndex); - _tprintf(_T(" Internet Address Physical Address Type\n")); + PrintMessageV(10003, szIntIpAddr, pIpNetTable->table[0].dwIndex); /* go through all ARP entries */ for (i=0; i < pIpNetTable->dwNumEntries; i++) @@ -269,7 +324,7 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) { if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { - _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); + PrintMessageV(10001, pszInetAddr); return EXIT_FAILURE; } } @@ -282,7 +337,7 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) /* check MAC address */ if (strlen(pszEthAddr) != 17) { - _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); + PrintMessageV(10002, pszEthAddr); return EXIT_FAILURE; } for (i=0; i<17; i++) @@ -292,7 +347,7 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) if (!isxdigit(pszEthAddr[i])) { - _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); + PrintMessageV(10002, pszEthAddr); return EXIT_FAILURE; } } @@ -412,7 +467,7 @@ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) bFlushTable = TRUE; else if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { - _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); + PrintMessageV(10001, pszInetAddr); exit(EXIT_FAILURE); } } @@ -508,35 +563,7 @@ cleanup: */ VOID Usage(VOID) { - _tprintf(_T("\nDisplays and modifies the IP-to-Physical address translation tables used by\n" - "address resolution protocol (ARP).\n" - "\n" - "ARP -s inet_addr eth_addr [if_addr]\n" - "ARP -d inet_addr [if_addr]\n" - "ARP -a [inet_addr] [-N if_addr]\n" - "\n" - " -a Displays current ARP entries by interrogating the current\n" - " protocol data. If inet_addr is specified, the IP and Physical\n" - " addresses for only the specified computer are displayed. If\n" - " more than one network interface uses ARP, entries for each ARP\n" - " table are displayed.\n" - " -g Same as -a.\n" - " inet_addr Specifies an internet address.\n" - " -N if_addr Displays the ARP entries for the network interface specified\n" - " by if_addr.\n" - " -d Deletes the host specified by inet_addr. inet_addr may be\n" - " wildcarded with * to delete all hosts.\n" - " -s Adds the host and associates the Internet address inet_addr\n" - " with the Physical address eth_addr. The Physical address is\n" - " given as 6 hexadecimal bytes separated by hyphens. The entry\n" - " is permanent.\n" - " eth_addr Specifies a physical address.\n" - " if_addr If present, this specifies the Internet address of the\n" - " interface whose address translation table should be modified.\n" - " If not present, the first applicable interface will be used.\n" - "Example:\n" - " > arp -s 157.55.85.212 00-aa-00-62-c6-09 .... Adds a static entry.\n" - " > arp -a .... Displays the arp table.\n\n")); + PrintMessage(10000); } /* diff --git a/base/applications/network/arp/arp.rc b/base/applications/network/arp/arp.rc index f206cd790ee..0076cca8d9c 100644 --- a/base/applications/network/arp/arp.rc +++ b/base/applications/network/arp/arp.rc @@ -3,3 +3,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "arp.exe" #define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy(a)gmail.com)" #include <reactos/version.rc> +#include <arp_msg.rc> diff --git a/sdk/include/reactos/mc/CMakeLists.txt b/sdk/include/reactos/mc/CMakeLists.txt index 46753f3bc16..9899bb8a800 100644 --- a/sdk/include/reactos/mc/CMakeLists.txt +++ b/sdk/include/reactos/mc/CMakeLists.txt @@ -3,6 +3,7 @@ list(APPEND ANSI_SOURCE bugcodes.mc) list(APPEND UNICODE_SOURCE + arp_msg.mc errcodes.mc net_msg.mc neteventmsg.mc diff --git a/sdk/include/reactos/mc/arp_msg.mc b/sdk/include/reactos/mc/arp_msg.mc new file mode 100644 index 00000000000..15aa4095cf1 --- /dev/null +++ b/sdk/include/reactos/mc/arp_msg.mc @@ -0,0 +1,123 @@ +MessageIdTypedef=DWORD + +SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS + Informational=0x1:STATUS_SEVERITY_INFORMATIONAL + Warning=0x2:STATUS_SEVERITY_WARNING + Error=0x3:STATUS_SEVERITY_ERROR + ) + +FacilityNames=(System=0x0:FACILITY_SYSTEM + ) + +LanguageNames=(English=0x409:MSG00409 + ) + +MessageId=10000 +SymbolicName=MSG_ARP_SYNTAX +Severity=Success +Facility=System +Language=English +Displays and modifies the IP-to-Physical address translation tables used by +address resolution protocol (ARP). + +ARP -s inet_addr eth_addr [if_addr] +ARP -d inet_addr [if_addr] +ARP -a [inet_addr] [-N if_addr] + + -a Displays current ARP entries by interrogating the current + protocol data. If inet_addr is specified, the IP and Physical + addresses for only the specified computer are displayed. If + more than one network interface uses ARP, entries for each ARP + table are displayed. + -g Same as -a. + inet_addr Specifies an internet address. + -N if_addr Displays the ARP entries for the network interface specified + by if_addr. + -d Deletes the host specified by inet_addr. inet_addr may be + wildcarded with * to delete all hosts. + -s Adds the host and associates the Internet address inet_addr + with the Physical address eth_addr. The Physical address is + given as 6 hexadecimal bytes separated by hyphens. The entry + is permanent. + eth_addr Specifies a physical address. + if_addr If present, this specifies the Internet address of the + interface whose address translation table should be modified. + If not present, the first applicable interface will be used. +Example: + > arp -s 157.55.85.212 00-aa-00-62-c6-09 .... Adds a static entry. + > arp -a .... Displays the arp table. +. + +MessageId=10001 +SymbolicName=MSG_ARP_BAD_IP_ADDRESS +Severity=Success +Facility=System +Language=English +ARP: bad IP address: %1 +. + +MessageId=10002 +SymbolicName=MSG_ARP_BAD_ARGUMENT +Severity=Success +Facility=System +Language=English +ARP: bad argument: %1 +. + +MessageId=10003 +SymbolicName=MSG_ARP_INTERFACE +Severity=Success +Facility=System +Language=English + +Interface: %1!s! --- 0x%2!lx! + Internet Address Physical Address Type +. + +MessageId=10005 +SymbolicName=MSG_ARP_OTHER +Severity=Success +Facility=System +Language=English +other%0 +. + +MessageId=10006 +SymbolicName=MSG_ARP_INVALID +Severity=Success +Facility=System +Language=English +invalid%0 +. + +MessageId=10007 +SymbolicName=MSG_ARP_DYNAMIC +Severity=Success +Facility=System +Language=English +dynamic%0 +. + +MessageId=10008 +SymbolicName=MSG_ARP_STATIC +Severity=Success +Facility=System +Language=English +static%0 +. + +MessageId=10013 +SymbolicName=MSG_ARP_ENTRY_FORMAT +Severity=Success +Facility=System +Language=English + %1!-20s! %2!-20s! %3!-10s! +. + +MessageId=10018 +SymbolicName=MSG_ARP_NO_ENTRIES +Severity=Success +Facility=System +Language=English +No ARP entires found +.

1 0

[reactos] 01/01: [RTLVER] Add missing bugcodes dependency.
by Thomas Faber 09 May '20

09 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8523913a581d6fb43cf64… commit 8523913a581d6fb43cf64649e86065104df36965 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat May 9 11:11:49 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat May 9 11:22:07 2020 +0200 [RTLVER] Add missing bugcodes dependency. --- sdk/lib/drivers/rtlver/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/drivers/rtlver/CMakeLists.txt b/sdk/lib/drivers/rtlver/CMakeLists.txt index 3b63ea16f0f..d568968da19 100644 --- a/sdk/lib/drivers/rtlver/CMakeLists.txt +++ b/sdk/lib/drivers/rtlver/CMakeLists.txt @@ -4,4 +4,4 @@ list(APPEND SOURCE rtl.c) add_library(rtlver ${SOURCE}) -add_dependencies(rtlver xdk) +add_dependencies(rtlver bugcodes xdk)

1 0

[reactos] 01/01: [RSAENH][MSXML3][OLE32] Revert PRIVATE commits (cbe8a9f and 38b438b)
by Katayama Hirofumi MZ 09 May '20

09 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ea110cda9a85cd176c32… commit 0ea110cda9a85cd176c32d197c186f754051f0fe Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat May 9 17:55:37 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat May 9 17:55:37 2020 +0900 [RSAENH][MSXML3][OLE32] Revert PRIVATE commits (cbe8a9f and 38b438b) --- dll/win32/msxml3/msxml3.spec | 2 +- dll/win32/ole32/ole32.spec | 2 +- dll/win32/rsaenh/rsaenh.spec | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/msxml3/msxml3.spec b/dll/win32/msxml3/msxml3.spec index 6f6f7b82f52..fd2c20502d0 100644 --- a/dll/win32/msxml3/msxml3.spec +++ b/dll/win32/msxml3/msxml3.spec @@ -7,6 +7,6 @@ 12 stub MSXML3_12 @ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dll/win32/ole32/ole32.spec b/dll/win32/ole32/ole32.spec index ac7c4128746..b56b01d84c6 100644 --- a/dll/win32/ole32/ole32.spec +++ b/dll/win32/ole32/ole32.spec @@ -134,7 +134,7 @@ @ stdcall CreateStreamOnHGlobal(ptr long ptr) # DcomChannelSetHResult @ stdcall DllDebugObjectRPCHook(long ptr) -@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall DllGetClassObject(ptr ptr ptr) @ stub DllGetClassObjectWOW @ stdcall -private DllRegisterServer() @ stdcall DoDragDrop(ptr ptr long ptr) diff --git a/dll/win32/rsaenh/rsaenh.spec b/dll/win32/rsaenh/rsaenh.spec index e3ceb02bc0d..becbbd4058f 100644 --- a/dll/win32/rsaenh/rsaenh.spec +++ b/dll/win32/rsaenh/rsaenh.spec @@ -23,5 +23,5 @@ @ stdcall CPSetProvParam(long long ptr long) RSAENH_CPSetProvParam @ stdcall CPSignHash(long long long wstr long ptr ptr) RSAENH_CPSignHash @ stdcall CPVerifySignature(long long ptr long long wstr long) RSAENH_CPVerifySignature -@ stdcall -private DllRegisterServer() -@ stdcall -private DllUnregisterServer() +@ stdcall DllRegisterServer() +@ stdcall DllUnregisterServer()

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
20
Older →

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 May 2020