Ros-diffs October 2012

ros-diffs@reactos.org

14 participants
211 discussions

[mnordell] 57540: Disable test for saving XML data until '

by mnordell＠svn.reactos.org

Author: mnordell Date: Fri Oct 12 17:06:28 2012 New Revision: 57540 URL: http://svn.reactos.org/svn/reactos?rev=57540&view=rev Log: Disable test for saving XML data until ' Modified: trunk/rostests/winetests/msxml3/domdoc.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Fri Oct 12 17:06:28 2012 @@ -1398,7 +1398,9 @@ istream_Clone }; +#if CORE_6738_IS_FIXED static IStream savestream = { &StreamVtbl }; +#endif #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) static void _expect_children(IXMLDOMNode *node, int line) @@ -7274,6 +7276,7 @@ free_bstrs(); } +#if CORE_6738_IS_FIXED static void test_save(void) { IXMLDOMDocument *doc, *doc2; @@ -7410,6 +7413,7 @@ IXMLDOMDocument_Release(doc); free_bstrs(); } +#endif /* CORE_6738_IS_FIXED */ static void test_testTransforms(void) { @@ -12538,7 +12542,9 @@ test_XSLPattern(); test_cloneNode(); test_xmlTypes(); +#if CORE_6738_IS_FIXED test_save(); +#endif test_testTransforms(); test_namespaces_basic(); test_namespaces_change();

12 years, 2 months

[tfaber] 57539: [WLANCONF] - Add localization support. Patch by Lee Schroeder. CORE-6721

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 12 11:40:53 2012 New Revision: 57539 URL: http://svn.reactos.org/svn/reactos?rev=57539&view=rev Log: [WLANCONF] - Add localization support. Patch by Lee Schroeder. CORE-6721 Added: trunk/reactos/base/applications/network/wlanconf/lang/ trunk/reactos/base/applications/network/wlanconf/lang/en-US.rc (with props) trunk/reactos/base/applications/network/wlanconf/resource.h (with props) Modified: trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt trunk/reactos/base/applications/network/wlanconf/wlanconf.c trunk/reactos/base/applications/network/wlanconf/wlanconf.rc Modified: trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] Fri Oct 12 11:40:53 2012 @@ -3,6 +3,13 @@ BEFORE include ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio) add_executable(wlanconf wlanconf.c wlanconf.rc) + +# FIXME: http://www.cmake.org/Bug/view.php?id=12998 +if(NOT MSVC) + #add_target_compile_flags(wlanconf "-Wno-format") + set_source_files_properties(wlanconf.c PROPERTIES COMPILE_FLAGS "-Wno-format") +endif() + set_module_type(wlanconf win32cui) -add_importlibs(wlanconf msvcrt iphlpapi kernel32) +add_importlibs(wlanconf msvcrt user32 iphlpapi kernel32) add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all) Added: trunk/reactos/base/applications/network/wlanconf/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/lang/en-US.rc (added) +++ trunk/reactos/base/applications/network/wlanconf/lang/en-US.rc [iso-8859-1] Fri Oct 12 11:40:53 2012 @@ -1,0 +1,40 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN +IDS_USAGE, "\nConfigure a WLAN adapter.\n\n\ +WLANCONF [-c SSID [-w WEP] [-a]] [-d] [-s]\n\n\ +\t-c SSID\t\tConnects to a supplied SSID,\n\ +\t-w WEP\t\tSpecifies a WEP key to use.\n\ +\t-a\t\tSpecifies the target network is ad-hoc\n\ +\t-d\t\tDisconnects from the current AP.\n\ +\t-s\t\tScans and displays a list of access points\n\ +\t\t\tin range.\n\n\ +Passing no parameters will print information about the current WLAN connection\n" +/* === */ +IDS_NO_NETWORK, "No networks found in range\n" +IDS_NO_WLAN_ADAPTER, "Unable to find a WLAN adapter on the system\n" +IDS_SUCCESS, "The operation completed successfully.\n" +IDS_WLAN_DISCONNECT, "\nWLAN disconnected\n" +/* === */ +IDS_MSG_WEP_ENABLED, "WEP enabled: %s\n" +IDS_MSG_NETWORK_MODE, "Network mode: %s\n" +IDS_MSG_CURRENT_WIRELESS, "\nCurrent wireless configuration information:\n\n" +IDS_MSG_ENCRYPTED, "Encrypted: %s\n" +IDS_MSG_NETWORK_TYPE, "Network Type: %s\n" +IDS_MSG_RSSI, "RSSI: %i dBm\n" +IDS_MSG_SUPPORT_RATE, "Supported Rates (Mbps): " +IDS_MSG_TRANSMISSION_POWER, "Transmission power: %d mW\n" +IDS_MSG_ANTENNA_COUNT, "Antenna count: %d\n" +IDS_MSG_TRANSMIT_ANTENNA, "Transmit antenna: %d\n" +IDS_MSG_TRANSMIT_ANTENNA_ANY, "Transmit antenna: Any\n" +IDS_MSG_RECEIVE_ANTENNA, "Receive antenna: %d\n" +IDS_MSG_RECEIVE_ANTENNA_ANY, "Receive antenna: Any\n" +IDS_MSG_FRAGMENT_THRESHOLD, "Fragmentation threshold: %d bytes\n" +IDS_MSG_RTS_THRESHOLD, "RTS threshold: %d bytes\n" +/* === */ +IDS_YES, "Yes" +IDS_NO, "No" +IDS_ADHOC, "Adhoc" +IDS_INFRASTRUCTURE, "Infrastructure" +END Propchange: trunk/reactos/base/applications/network/wlanconf/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/wlanconf/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/resource.h (added) +++ trunk/reactos/base/applications/network/wlanconf/resource.h [iso-8859-1] Fri Oct 12 11:40:53 2012 @@ -1,0 +1,24 @@ +#define IDS_USAGE 0 +#define IDS_NO_NETWORK 1 +#define IDS_NO_WLAN_ADAPTER 2 +#define IDS_SUCCESS 3 +#define IDS_WLAN_DISCONNECT 4 +#define IDS_MSG_WEP_ENABLED 5 +#define IDS_MSG_NETWORK_MODE 6 +#define IDS_MSG_CURRENT_WIRELESS 7 +#define IDS_MSG_ENCRYPTED 8 +#define IDS_MSG_NETWORK_TYPE 9 +#define IDS_MSG_RSSI 10 +#define IDS_MSG_SUPPORT_RATE 11 +#define IDS_MSG_TRANSMISSION_POWER 12 +#define IDS_MSG_ANTENNA_COUNT 13 +#define IDS_MSG_TRANSMIT_ANTENNA 14 +#define IDS_MSG_TRANSMIT_ANTENNA_ANY 15 +#define IDS_MSG_RECEIVE_ANTENNA 16 +#define IDS_MSG_RECEIVE_ANTENNA_ANY 17 +#define IDS_MSG_FRAGMENT_THRESHOLD 18 +#define IDS_MSG_RTS_THRESHOLD 19 +#define IDS_YES 20 +#define IDS_NO 21 +#define IDS_ADHOC 22 +#define IDS_INFRASTRUCTURE 23 Propchange: trunk/reactos/base/applications/network/wlanconf/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Fri Oct 12 11:40:53 2012 @@ -14,14 +14,32 @@ #include <nuiouser.h> #include <iphlpapi.h> +#include "resource.h" + +#define COUNT_OF(a) (sizeof(a) / sizeof(a[0])) +#define MAX_BUFFER_SIZE 5024 + BOOL bScan = FALSE; BOOL bConnect = FALSE; -char* sSsid = NULL; -char* sWepKey = NULL; +char *sSsid = NULL; +char *sWepKey = NULL; BOOL bAdhoc = FALSE; BOOL bDisconnect = FALSE; + +/* This takes strings from a resource stringtable and outputs it to +the command prompt. */ +VOID PrintResourceString(INT resID, ...) +{ + TCHAR szMsgBuf[MAX_BUFFER_SIZE]; + va_list arg_ptr; + + va_start(arg_ptr, resID); + LoadString(GetModuleHandle(NULL), resID, szMsgBuf, MAX_BUFFER_SIZE); + _vtprintf(szMsgBuf, arg_ptr); + va_end(arg_ptr); +} DWORD DoFormatMessage(DWORD ErrorCode) { @@ -258,7 +276,7 @@ if (!bSuccess) return FALSE; - _tprintf(_T("The operation completed successfully.\n")); + PrintResourceString(IDS_SUCCESS); return TRUE; } @@ -317,6 +335,7 @@ PNDIS_802_11_SSID SsidInfo; CHAR SsidBuffer[NDIS_802_11_LENGTH_SSID + 1]; DWORD i; + TCHAR szMsgBuf[128]; QueryOidSize = FIELD_OFFSET(NDISUIO_QUERY_OID, Data) + sizeof(NDIS_802_11_SSID); QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); @@ -362,16 +381,16 @@ NULL); if (SsidInfo->SsidLength == 0 || !bSuccess) { - _tprintf(_T("\nWLAN disconnected\n")); + PrintResourceString(IDS_WLAN_DISCONNECT); HeapFree(GetProcessHeap(), 0, QueryOid); return TRUE; } else { - _tprintf(_T("\nCurrent wireless configuration information:\n\n")); - } - - _tprintf(_T("SSID: %s\n"), SsidBuffer); + PrintResourceString(IDS_MSG_CURRENT_WIRELESS); + } + + _tprintf(_T("SSID: %hs\n"), SsidBuffer); _tprintf(_T("BSSID: ")); for (i = 0; i < sizeof(NDIS_802_11_MAC_ADDRESS); i++) @@ -407,7 +426,11 @@ return FALSE; } - _tprintf(_T("Network mode: %s\n"), (*(PUINT)QueryOid->Data == Ndis802_11IBSS) ? "Adhoc" : "Infrastructure"); + LoadString(GetModuleHandle(NULL), + *(PUINT)QueryOid->Data == Ndis802_11IBSS ? IDS_ADHOC : IDS_INFRASTRUCTURE, + szMsgBuf, + COUNT_OF(szMsgBuf)); + PrintResourceString(IDS_MSG_NETWORK_MODE, szMsgBuf); QueryOid->Oid = OID_802_11_WEP_STATUS; @@ -425,9 +448,13 @@ return FALSE; } - _tprintf(_T("WEP enabled: %s\n"), (*(PUINT)QueryOid->Data == Ndis802_11WEPEnabled) ? "Yes" : "No"); - - _tprintf("\n"); + LoadString(GetModuleHandle(NULL), + *(PUINT)QueryOid->Data == Ndis802_11WEPEnabled ? IDS_YES : IDS_NO, + szMsgBuf, + COUNT_OF(szMsgBuf)); + PrintResourceString(IDS_MSG_WEP_ENABLED, szMsgBuf); + + _tprintf(_T("\n")); QueryOid->Oid = OID_802_11_RSSI; bSuccess = DeviceIoControl(hAdapter, @@ -457,7 +484,7 @@ if (bSuccess) { /* This OID is optional */ - _tprintf(_T("Transmission power: %d mW\n"), *(PUINT)QueryOid->Data); + PrintResourceString(IDS_MSG_TRANSMISSION_POWER, *(PUINT)QueryOid->Data); } _tprintf(_T("\n")); @@ -475,7 +502,7 @@ if (bSuccess) { /* This OID is optional */ - _tprintf(_T("Antenna count: %d\n"), *(PUINT)QueryOid->Data); + PrintResourceString(IDS_MSG_ANTENNA_COUNT, *(PUINT)QueryOid->Data); } QueryOid->Oid = OID_802_11_TX_ANTENNA_SELECTED; @@ -493,9 +520,9 @@ UINT TransmitAntenna = *(PUINT)QueryOid->Data; if (TransmitAntenna != 0xFFFFFFFF) - _tprintf(_T("Transmit antenna: %d\n"), TransmitAntenna); + PrintResourceString(IDS_MSG_TRANSMIT_ANTENNA, TransmitAntenna); else - _tprintf(_T("Transmit antenna: Any\n")); + PrintResourceString(IDS_MSG_TRANSMIT_ANTENNA_ANY); } QueryOid->Oid = OID_802_11_RX_ANTENNA_SELECTED; @@ -513,9 +540,9 @@ UINT ReceiveAntenna = *(PUINT)QueryOid->Data; if (ReceiveAntenna != 0xFFFFFFFF) - _tprintf(_T("Receive antenna: %d\n"), ReceiveAntenna); + PrintResourceString(IDS_MSG_RECEIVE_ANTENNA, ReceiveAntenna); else - _tprintf(_T("Receive antenna: Any\n")); + PrintResourceString(IDS_MSG_RECEIVE_ANTENNA_ANY); } _tprintf(_T("\n")); @@ -533,7 +560,7 @@ if (bSuccess) { /* This OID is optional */ - _tprintf(_T("Fragmentation threshold: %d bytes\n"), *(PUINT)QueryOid->Data); + PrintResourceString(IDS_MSG_FRAGMENT_THRESHOLD, *(PUINT)QueryOid->Data); } QueryOid->Oid = OID_802_11_RTS_THRESHOLD; @@ -549,7 +576,7 @@ if (bSuccess) { /* This OID is optional */ - _tprintf(_T("RTS threshold: %d bytes\n"), *(PUINT)QueryOid->Data); + PrintResourceString(IDS_MSG_RTS_THRESHOLD, *(PUINT)QueryOid->Data); } HeapFree(GetProcessHeap(), 0, QueryOid); @@ -722,7 +749,7 @@ if (!bSuccess) return FALSE; - _tprintf(_T("The operation completed successfully.\n")); + PrintResourceString(IDS_SUCCESS); return TRUE; } @@ -736,6 +763,7 @@ DWORD QueryOidSize; PNDIS_802_11_BSSID_LIST BssidList; DWORD i, j; + TCHAR szMsgBuf[128]; SetOid.Oid = OID_802_11_BSSID_LIST_SCAN; @@ -776,7 +804,7 @@ if (BssidList->NumberOfItems == 0) { - _tprintf(_T("No networks found in range\n")); + PrintResourceString(IDS_NO_NETWORK); } else { @@ -793,9 +821,7 @@ RtlCopyMemory(SsidBuffer, Ssid->Ssid, Ssid->SsidLength); SsidBuffer[Ssid->SsidLength] = 0; - _tprintf(_T("\n")); - - _tprintf(_T("SSID: %s\n"), SsidBuffer); + _tprintf(_T("\nSSID: %hs\n"), SsidBuffer); _tprintf(_T("BSSID: ")); for (j = 0; j < sizeof(NDIS_802_11_MAC_ADDRESS); j++) @@ -809,13 +835,18 @@ } _tprintf(_T("\n")); - _tprintf(_T("Encrypted: %s\n" - "Network Type: %s\n" - "RSSI: %i dBm\n" - "Supported Rates (Mbps): "), - BssidInfo->Privacy == 0 ? "No" : "Yes", - NetworkType == Ndis802_11IBSS ? "Adhoc" : "Infrastructure", - (int)Rssi); + LoadString(GetModuleHandle(NULL), + BssidInfo->Privacy == 0 ? IDS_NO : IDS_YES, + szMsgBuf, + COUNT_OF(szMsgBuf)); + PrintResourceString(IDS_MSG_ENCRYPTED, szMsgBuf); + LoadString(GetModuleHandle(NULL), + NetworkType == Ndis802_11IBSS ? IDS_ADHOC : IDS_INFRASTRUCTURE, + szMsgBuf, + COUNT_OF(szMsgBuf)); + PrintResourceString(IDS_MSG_NETWORK_TYPE, szMsgBuf); + PrintResourceString(IDS_MSG_RSSI, (int)Rssi); + PrintResourceString(IDS_MSG_SUPPORT_RATE); for (j = 0; j < NDIS_802_11_LENGTH_RATES; j++) { @@ -850,20 +881,7 @@ return bSuccess; } -VOID Usage() -{ - _tprintf(_T("\nConfigures a WLAN adapter.\n\n" - "WLANCONF [-c SSID [-w WEP] [-a]] [-d] [-s]\n\n" - " -c SSID Connects to a supplied SSID.\n" - " -w WEP Specifies a WEP key to use.\n" - " -a Specifies the target network is ad-hoc\n" - " -d Disconnects from the current AP.\n" - " -s Scans and displays a list of access points in range.\n\n" - " Passing no parameters will print information about the current WLAN connection\n")); -} - - -BOOL ParseCmdline(int argc, char* argv[]) +BOOL ParseCmdline(int argc, char *argv[]) { INT i; @@ -882,7 +900,7 @@ case 'c': if (i == argc - 1) { - Usage(); + PrintResourceString(IDS_USAGE); return FALSE; } bConnect = TRUE; @@ -891,7 +909,7 @@ case 'w': if (i == argc - 1) { - Usage(); + PrintResourceString(IDS_USAGE); return FALSE; } sWepKey = argv[++i]; @@ -900,14 +918,14 @@ bAdhoc = TRUE; break; default : - Usage(); + PrintResourceString(IDS_USAGE); return FALSE; } } else { - Usage(); + PrintResourceString(IDS_USAGE); return FALSE; } } @@ -915,7 +933,7 @@ return TRUE; } -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { HANDLE hAdapter; IP_ADAPTER_INDEX_MAP IpInfo; @@ -925,7 +943,7 @@ if (!OpenWlanAdapter(&hAdapter, &IpInfo)) { - _tprintf(_T("Unable to find a WLAN adapter on the system\n")); + PrintResourceString(IDS_NO_WLAN_ADAPTER); return -1; } Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.rc [iso-8859-1] Fri Oct 12 11:40:53 2012 @@ -1,7 +1,17 @@ +#include "resource.h" + +#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define REACTOS_STR_FILE_DESCRIPTION "ReactOS WLAN Configuration Tool\0" #define REACTOS_STR_INTERNAL_NAME "wlanconf\0" #define REACTOS_STR_ORIGINAL_FILENAME "wlanconf.exe\0" #define REACTOS_STR_ORIGINAL_COPYRIGHT "Cameron Gutman (cameron.gutman(a)reactos.org)\0" #include <reactos/version.rc> - +// UTF-8 +#pragma code_page(65001) +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif

12 years, 2 months

[tfaber] 57538: [WLANCONF] - Fix a potential buffer overflow, fix a handle leak, fix an MSVC warning

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 12 10:56:08 2012 New Revision: 57538 URL: http://svn.reactos.org/svn/reactos?rev=57538&view=rev Log: [WLANCONF] - Fix a potential buffer overflow, fix a handle leak, fix an MSVC warning Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Fri Oct 12 10:56:08 2012 @@ -68,7 +68,7 @@ NULL); if (hDriver == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; - + /* Wait for binds */ bSuccess = DeviceIoControl(hDriver, IOCTL_NDISUIO_BIND_WAIT, @@ -83,7 +83,7 @@ CloseHandle(hDriver); return INVALID_HANDLE_VALUE; } - + return hDriver; } @@ -119,14 +119,15 @@ DWORD dwBytesReturned; DWORD QueryBindingSize = sizeof(NDISUIO_QUERY_BINDING) + (1024 * sizeof(WCHAR)); PNDISUIO_QUERY_BINDING QueryBinding; - DWORD dwStatus, dwSize, i; + DWORD dwStatus, dwSize; + LONG i; PIP_INTERFACE_INFO InterfaceInfo = NULL; - + /* Open the driver handle */ hDriver = OpenDriverHandle(); if (hDriver == INVALID_HANDLE_VALUE) return FALSE; - + /* Allocate the binding struct */ QueryBinding = HeapAlloc(GetProcessHeap(), 0, QueryBindingSize); if (!QueryBinding) @@ -152,7 +153,7 @@ CloseHandle(hDriver); return FALSE; } - + /* Bind to the adapter */ bSuccess = DeviceIoControl(hDriver, IOCTL_NDISUIO_OPEN_DEVICE, @@ -174,7 +175,7 @@ dwSize = sizeof(IP_INTERFACE_INFO); do { if (InterfaceInfo) HeapFree(GetProcessHeap(), 0, InterfaceInfo); - InterfaceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(IP_INTERFACE_INFO)); + InterfaceInfo = HeapAlloc(GetProcessHeap(), 0, dwSize); if (!InterfaceInfo) { HeapFree(GetProcessHeap(), 0, QueryBinding); @@ -183,14 +184,15 @@ } dwStatus = GetInterfaceInfo(InterfaceInfo, &dwSize); } while (dwStatus == ERROR_INSUFFICIENT_BUFFER); - + if (dwStatus != NO_ERROR) { HeapFree(GetProcessHeap(), 0, QueryBinding); HeapFree(GetProcessHeap(), 0, InterfaceInfo); - return FALSE; - } - + CloseHandle(hDriver); + return FALSE; + } + for (i = 0; i < InterfaceInfo->NumAdapters; i++) { if (wcsstr((PWCHAR)((PUCHAR)QueryBinding + QueryBinding->DeviceNameOffset), @@ -198,10 +200,10 @@ { *IpInfo = InterfaceInfo->Adapter[i]; *hAdapter = hDriver; - + HeapFree(GetProcessHeap(), 0, QueryBinding); HeapFree(GetProcessHeap(), 0, InterfaceInfo); - + return TRUE; } } @@ -223,7 +225,7 @@ { if (!OpenAdapterHandle(dwCurrentIndex, hAdapter, IpInfo)) break; - + if (IsWlanAdapter(*hAdapter)) return TRUE; else @@ -239,7 +241,7 @@ BOOL bSuccess; DWORD dwBytesReturned; NDISUIO_SET_OID SetOid; - + /* Release this IP address */ IpReleaseAddress(IpInfo); @@ -265,7 +267,7 @@ CharToHex(CHAR Char) { Char = toupper(Char); - + switch (Char) { case '0': @@ -315,12 +317,12 @@ PNDIS_802_11_SSID SsidInfo; CHAR SsidBuffer[NDIS_802_11_LENGTH_SSID + 1]; DWORD i; - + QueryOidSize = FIELD_OFFSET(NDISUIO_QUERY_OID, Data) + sizeof(NDIS_802_11_SSID); QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); if (!QueryOid) return FALSE; - + QueryOid->Oid = OID_802_11_SSID; SsidInfo = (PNDIS_802_11_SSID)QueryOid->Data; @@ -337,7 +339,7 @@ HeapFree(GetProcessHeap(), 0, QueryOid); return FALSE; } - + /* Copy the SSID to our internal buffer and terminate it */ RtlCopyMemory(SsidBuffer, SsidInfo->Ssid, SsidInfo->SsidLength); SsidBuffer[SsidInfo->SsidLength] = 0; @@ -349,7 +351,7 @@ return FALSE; QueryOid->Oid = OID_802_11_BSSID; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -382,15 +384,15 @@ _tprintf(_T(":")); } _tprintf(_T("\n")); - + HeapFree(GetProcessHeap(), 0, QueryOid); QueryOidSize = sizeof(NDISUIO_QUERY_OID); QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); if (!QueryOid) return FALSE; - + QueryOid->Oid = OID_802_11_INFRASTRUCTURE_MODE; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -404,11 +406,11 @@ HeapFree(GetProcessHeap(), 0, QueryOid); return FALSE; } - + _tprintf(_T("Network mode: %s\n"), (*(PUINT)QueryOid->Data == Ndis802_11IBSS) ? "Adhoc" : "Infrastructure"); - + QueryOid->Oid = OID_802_11_WEP_STATUS; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -422,12 +424,12 @@ HeapFree(GetProcessHeap(), 0, QueryOid); return FALSE; } - + _tprintf(_T("WEP enabled: %s\n"), (*(PUINT)QueryOid->Data == Ndis802_11WEPEnabled) ? "Yes" : "No"); - + _tprintf("\n"); QueryOid->Oid = OID_802_11_RSSI; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -441,9 +443,9 @@ /* This OID is optional */ _tprintf(_T("RSSI: %i dBm\n"), *(PINT)QueryOid->Data); } - + QueryOid->Oid = OID_802_11_TX_POWER_LEVEL; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -457,11 +459,11 @@ /* This OID is optional */ _tprintf(_T("Transmission power: %d mW\n"), *(PUINT)QueryOid->Data); } - + _tprintf(_T("\n")); - + QueryOid->Oid = OID_802_11_NUMBER_OF_ANTENNAS; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -475,9 +477,9 @@ /* This OID is optional */ _tprintf(_T("Antenna count: %d\n"), *(PUINT)QueryOid->Data); } - + QueryOid->Oid = OID_802_11_TX_ANTENNA_SELECTED; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -489,15 +491,15 @@ if (bSuccess) { UINT TransmitAntenna = *(PUINT)QueryOid->Data; - + if (TransmitAntenna != 0xFFFFFFFF) _tprintf(_T("Transmit antenna: %d\n"), TransmitAntenna); else _tprintf(_T("Transmit antenna: Any\n")); } - + QueryOid->Oid = OID_802_11_RX_ANTENNA_SELECTED; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -509,17 +511,17 @@ if (bSuccess) { UINT ReceiveAntenna = *(PUINT)QueryOid->Data; - + if (ReceiveAntenna != 0xFFFFFFFF) _tprintf(_T("Receive antenna: %d\n"), ReceiveAntenna); else _tprintf(_T("Receive antenna: Any\n")); } - + _tprintf(_T("\n")); - + QueryOid->Oid = OID_802_11_FRAGMENTATION_THRESHOLD; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -533,9 +535,9 @@ /* This OID is optional */ _tprintf(_T("Fragmentation threshold: %d bytes\n"), *(PUINT)QueryOid->Data); } - + QueryOid->Oid = OID_802_11_RTS_THRESHOLD; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, QueryOid, @@ -549,9 +551,9 @@ /* This OID is optional */ _tprintf(_T("RTS threshold: %d bytes\n"), *(PUINT)QueryOid->Data); } - + HeapFree(GetProcessHeap(), 0, QueryOid); - + _tprintf(_T("\n")); return TRUE; } @@ -564,7 +566,7 @@ PNDISUIO_SET_OID SetOid; PNDIS_802_11_SSID Ssid; DWORD i; - + SetOidSize = sizeof(NDISUIO_SET_OID); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) @@ -573,7 +575,7 @@ /* Set the network mode */ SetOid->Oid = OID_802_11_INFRASTRUCTURE_MODE; *(PULONG)SetOid->Data = bAdhoc ? Ndis802_11IBSS : Ndis802_11Infrastructure; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, SetOid, @@ -591,7 +593,7 @@ /* Set the authentication mode */ SetOid->Oid = OID_802_11_AUTHENTICATION_MODE; *(PULONG)SetOid->Data = sWepKey ? Ndis802_11AuthModeShared : Ndis802_11AuthModeOpen; - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, SetOid, @@ -605,11 +607,11 @@ HeapFree(GetProcessHeap(), 0, SetOid); return FALSE; } - + if (sWepKey) { PNDIS_802_11_WEP WepData; - + HeapFree(GetProcessHeap(), 0, SetOid); SetOidSize = FIELD_OFFSET(NDISUIO_SET_OID, Data) + @@ -618,7 +620,7 @@ SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) return FALSE; - + /* Add the WEP key */ SetOid->Oid = OID_802_11_ADD_WEP; WepData = (PNDIS_802_11_WEP)SetOid->Data; @@ -626,7 +628,7 @@ WepData->KeyIndex = 0x80000000; WepData->KeyLength = strlen(sWepKey) >> 1; WepData->Length = FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + WepData->KeyLength; - + /* Assemble the hex key */ i = 0; while (sWepKey[i << 1] != '\0') @@ -635,7 +637,7 @@ WepData->KeyMaterial[i] |= CharToHex(sWepKey[(i << 1) + 1]); i++; } - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, SetOid, @@ -668,17 +670,17 @@ HeapFree(GetProcessHeap(), 0, SetOid); return FALSE; } - + HeapFree(GetProcessHeap(), 0, SetOid); SetOidSize = FIELD_OFFSET(NDISUIO_SET_OID, Data) + sizeof(NDIS_802_11_MAC_ADDRESS); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) return FALSE; - + /* Set the BSSID */ SetOid->Oid = OID_802_11_BSSID; RtlFillMemory(SetOid->Data, sizeof(NDIS_802_11_MAC_ADDRESS), 0xFF); - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, SetOid, @@ -692,20 +694,20 @@ HeapFree(GetProcessHeap(), 0, SetOid); return FALSE; } - + HeapFree(GetProcessHeap(), 0, SetOid); SetOidSize = FIELD_OFFSET(NDISUIO_SET_OID, Data) + sizeof(NDIS_802_11_SSID); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) return FALSE; - + /* Finally, set the SSID */ SetOid->Oid = OID_802_11_SSID; Ssid = (PNDIS_802_11_SSID)SetOid->Data; - + RtlCopyMemory(Ssid->Ssid, sSsid, strlen(sSsid)); Ssid->SsidLength = strlen(sSsid); - + bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, SetOid, @@ -714,9 +716,9 @@ 0, &dwBytesReturned, NULL); - + HeapFree(GetProcessHeap(), 0, SetOid); - + if (!bSuccess) return FALSE; @@ -736,7 +738,7 @@ DWORD i, j; SetOid.Oid = OID_802_11_BSSID_LIST_SCAN; - + /* Send the scan OID */ bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, @@ -748,13 +750,13 @@ NULL); if (!bSuccess) return FALSE; - + /* Allocate space for 15 networks to be returned */ QueryOidSize = sizeof(NDISUIO_QUERY_OID) + (sizeof(NDIS_WLAN_BSSID) * 15); QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); if (!QueryOid) return FALSE; - + QueryOid->Oid = OID_802_11_BSSID_LIST; BssidList = (PNDIS_802_11_BSSID_LIST)QueryOid->Data; @@ -814,7 +816,7 @@ BssidInfo->Privacy == 0 ? "No" : "Yes", NetworkType == Ndis802_11IBSS ? "Adhoc" : "Infrastructure", (int)Rssi); - + for (j = 0; j < NDIS_802_11_LENGTH_RATES; j++) { Rate = BssidInfo->SupportedRates[j]; @@ -837,14 +839,14 @@ } } _tprintf(_T("\n")); - + /* Move to the next entry */ BssidInfo = (PNDIS_WLAN_BSSID)((PUCHAR)BssidInfo + BssidInfo->Length); } } - + HeapFree(GetProcessHeap(), 0, QueryOid); - + return bSuccess; } @@ -864,7 +866,7 @@ BOOL ParseCmdline(int argc, char* argv[]) { INT i; - + for (i = 1; i < argc; i++) { if (argv[i][0] == '-') @@ -920,13 +922,13 @@ if (!ParseCmdline(argc, argv)) return -1; - + if (!OpenWlanAdapter(&hAdapter, &IpInfo)) { _tprintf(_T("Unable to find a WLAN adapter on the system\n")); return -1; } - + if (bScan) { if (!WlanScan(hAdapter))

12 years, 2 months

[jgardou] 57537: [WIN32K] - Accept to fill a BITMAPCOREINFO structure in NtGdiGetDIBitsInternal

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 11 13:33:09 2012 New Revision: 57537 URL: http://svn.reactos.org/svn/reactos?rev=57537&view=rev Log: [WIN32K] - Accept to fill a BITMAPCOREINFO structure in NtGdiGetDIBitsInternal Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Thu Oct 11 13:33:09 2012 @@ -1014,7 +1014,7 @@ if (iUsage > 2) return 0; /* Check if the size of the bitmap info is large enough */ - if (cjMaxInfo < sizeof(BITMAPINFOHEADER)) + if (cjMaxInfo < sizeof(BITMAPCOREHEADER)) { return 0; } @@ -1048,7 +1048,7 @@ _SEH2_END; /* Check if the header size is large enough */ - if ((pbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) || + if ((pbmi->bmiHeader.biSize < sizeof(BITMAPCOREHEADER)) || (pbmi->bmiHeader.biSize > cjMaxInfo)) { goto cleanup;

12 years, 2 months

[hbelusca] 57536: [CRT] Use a temporary buffer to parse the program's arguments, instead of using (and thus overwriting) the _a/wcmdln variable. Fix msvcrt_apitest:CommandLine test. CORE-6717 #comm...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Oct 11 00:30:57 2012 New Revision: 57536 URL: http://svn.reactos.org/svn/reactos?rev=57536&view=rev Log: [CRT] Use a temporary buffer to parse the program's arguments, instead of using (and thus overwriting) the _a/wcmdln variable. Fix msvcrt_apitest:CommandLine test. CORE-6717 #comment Fixed in revision r57536. #resolve Modified: trunk/reactos/lib/sdk/crt/misc/getargs.c Modified: trunk/reactos/lib/sdk/crt/misc/getargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/getargs.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] Thu Oct 11 00:30:57 2012 @@ -183,6 +183,7 @@ { int i, afterlastspace, ignorespace, doexpand; size_t len; + char* aNewCmdln; /* missing threading init */ @@ -203,10 +204,12 @@ len = strlen(_acmdln); - - while (_acmdln[i]) - { - if (_acmdln[i] == '"') + /* Allocate a temporary buffer to be used instead of the original _acmdln parameter. */ + aNewCmdln = strndup(_acmdln, len); + + while (aNewCmdln[i]) + { + if (aNewCmdln[i] == '"') { if(ignorespace) { @@ -217,16 +220,16 @@ ignorespace = 1; doexpand = 0; } - memmove(_acmdln + i, _acmdln + i + 1, len - i); + memmove(aNewCmdln + i, aNewCmdln + i + 1, len - i); len--; continue; } - if (_acmdln[i] == ' ' && !ignorespace) - { - aexpand(strndup(_acmdln + afterlastspace, i - afterlastspace), doexpand); + if (aNewCmdln[i] == ' ' && !ignorespace) + { + aexpand(strndup(aNewCmdln + afterlastspace, i - afterlastspace), doexpand); i++; - while (_acmdln[i]==' ') + while (aNewCmdln[i] == ' ') i++; afterlastspace=i; doexpand = expand_wildcards; @@ -237,10 +240,13 @@ } } - if (_acmdln[afterlastspace] != 0) - { - aexpand(strndup(_acmdln+afterlastspace, i - afterlastspace), doexpand); - } + if (aNewCmdln[afterlastspace] != 0) + { + aexpand(strndup(aNewCmdln + afterlastspace, i - afterlastspace), doexpand); + } + + /* Free the temporary buffer. */ + free(aNewCmdln); HeapValidate(GetProcessHeap(), 0, NULL); @@ -265,6 +271,7 @@ { int i, afterlastspace, ignorespace, doexpand; size_t len; + wchar_t* wNewCmdln; /* missing threading init */ @@ -285,9 +292,12 @@ len = wcslen(_wcmdln); - while (_wcmdln[i]) - { - if (_wcmdln[i] == L'"') + /* Allocate a temporary buffer to be used instead of the original _wcmdln parameter. */ + wNewCmdln = wcsndup(_wcmdln, len); + + while (wNewCmdln[i]) + { + if (wNewCmdln[i] == L'"') { if(ignorespace) { @@ -298,16 +308,16 @@ ignorespace = 1; doexpand = 0; } - memmove(_wcmdln + i, _wcmdln + i + 1, (len - i) * sizeof(wchar_t)); + memmove(wNewCmdln + i, wNewCmdln + i + 1, (len - i) * sizeof(wchar_t)); len--; continue; } - if (_wcmdln[i] == L' ' && !ignorespace) - { - wexpand(wcsndup(_wcmdln + afterlastspace, i - afterlastspace), doexpand); + if (wNewCmdln[i] == L' ' && !ignorespace) + { + wexpand(wcsndup(wNewCmdln + afterlastspace, i - afterlastspace), doexpand); i++; - while (_wcmdln[i]==L' ') + while (wNewCmdln[i] == L' ') i++; afterlastspace=i; doexpand = expand_wildcards; @@ -318,10 +328,13 @@ } } - if (_wcmdln[afterlastspace] != 0) - { - wexpand(wcsndup(_wcmdln+afterlastspace, i - afterlastspace), doexpand); - } + if (wNewCmdln[afterlastspace] != 0) + { + wexpand(wcsndup(wNewCmdln + afterlastspace, i - afterlastspace), doexpand); + } + + /* Free the temporary buffer. */ + free(wNewCmdln); HeapValidate(GetProcessHeap(), 0, NULL);

12 years, 2 months

[jgardou] 57535: [GDI32] - Assume that the provided buffer size is maximal in GetDIBits [WIN32K] - Probe buffer before writing to it - Fail DIB Section creation if palette creation failed

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Oct 10 23:05:38 2012 New Revision: 57535 URL: http://svn.reactos.org/svn/reactos?rev=57535&view=rev Log: [GDI32] - Assume that the provided buffer size is maximal in GetDIBits [WIN32K] - Probe buffer before writing to it - Fail DIB Section creation if palette creation failed Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Wed Oct 10 23:05:38 2012 @@ -13,7 +13,7 @@ * 11/16/1999 (RJJ) lifted from wine */ -INT FASTCALL DIB_BitmapInfoSize(const BITMAPINFO * info, WORD coloruse) +INT FASTCALL DIB_BitmapInfoSize(const BITMAPINFO * info, WORD coloruse, BOOL max) { unsigned int colors, size, masks = 0; @@ -26,7 +26,7 @@ } else /* assume BITMAPINFOHEADER */ { - colors = info->bmiHeader.biClrUsed; + colors = max ? 1 << info->bmiHeader.biBitCount : info->bmiHeader.biClrUsed; if (colors > 256) colors = 256; if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; @@ -409,7 +409,8 @@ } cjBmpScanSize = DIB_BitmapMaxBitsSize(lpbmi, cScanLines); - cjInfoSize = DIB_BitmapInfoSize(lpbmi, uUsage); + /* Caller must provide maximum size possible */ + cjInfoSize = DIB_BitmapInfoSize(lpbmi, uUsage, TRUE); if ( lpvBits ) { Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Wed Oct 10 23:05:38 2012 @@ -1038,7 +1038,7 @@ _SEH2_TRY { /* Probe and copy the BITMAPINFO */ - ProbeForWrite(pbmiUser, cjMaxInfo, 1); + ProbeForRead(pbmiUser, cjMaxInfo, 1); RtlCopyMemory(pbmi, pbmiUser, cjMaxInfo); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1082,7 +1082,8 @@ /* Use SEH to copy back to user mode */ _SEH2_TRY { - /* Buffer is already probed, copy the data back */ + /* Copy the data back */ + ProbeForWrite(pbmiUser, cjMaxInfo, 1); RtlCopyMemory(pbmiUser, pbmi, cjMaxInfo); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1551,7 +1552,7 @@ HBITMAP res = 0; SURFACE *bmp = NULL; void *mapBits = NULL; - PPALETTE ppalDIB; + PPALETTE ppalDIB = NULL; // Fill BITMAP32 structure with DIB data CONST BITMAPINFOHEADER *bi = &bmi->bmiHeader; @@ -1685,15 +1686,10 @@ /* Create a palette for the DIB */ ppalDIB = CreateDIBPalette(bmi, dc, usage); - if (ppalDIB) - { - SURFACE_vSetPalette(bmp, ppalDIB); - PALETTE_ShareUnlockPalette(ppalDIB); - } // Clean up in case of errors cleanup: - if (!res || !bmp || !bm.bmBits) + if (!res || !bmp || !bm.bmBits || !ppalDIB) { DPRINT("Got an error res=%p, bmp=%p, bm.bmBits=%p\n", res, bmp, bm.bmBits); if (bm.bmBits) @@ -1709,17 +1705,28 @@ } if (bmp) + { + SURFACE_ShareUnlockSurface(bmp); bmp = NULL; + } if (res) { GreDeleteObject(res); res = 0; } + + if(ppalDIB) + { + PALETTE_ShareUnlockPalette(ppalDIB); + } } if (bmp) { + /* If we're here, everything went fine */ + SURFACE_vSetPalette(bmp, ppalDIB); + PALETTE_ShareUnlockPalette(ppalDIB); SURFACE_ShareUnlockSurface(bmp); }

12 years, 2 months

[hbelusca] 57534: [MSVCRT:APITEST] Modify the test for GetModuleFileName, should work better now.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 10 21:56:27 2012 New Revision: 57534 URL: http://svn.reactos.org/svn/reactos?rev=57534&view=rev Log: [MSVCRT:APITEST] Modify the test for GetModuleFileName, should work better now. Modified: trunk/rostests/apitests/msvcrt/CommandLine.c Modified: trunk/rostests/apitests/msvcrt/CommandLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLi… ============================================================================== --- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Wed Oct 10 21:56:27 2012 @@ -286,17 +286,16 @@ { ULONG i; - DWORD dwError; + DWORD dwRet; LPWSTR p = NULL; /* * Initialize the UtilityProgramDirectory variable. */ - GetModuleFileNameW(NULL, UtilityProgramDirectory, COUNT_OF(UtilityProgramDirectory)); - dwError = GetLastError(); - ok(dwError == ERROR_SUCCESS, "ERROR: Cannot retrieve the path to the current running process, last error %lu\n", dwError); - if (dwError != ERROR_SUCCESS) return; + dwRet = GetModuleFileNameW(NULL, UtilityProgramDirectory, COUNT_OF(UtilityProgramDirectory)); + ok(dwRet != 0, "ERROR: Cannot retrieve the path to the current running process, last error %lu\n", GetLastError()); + if (dwRet == 0) return; /* Path : executable.exe or "executable.exe" or C:\path\executable.exe or "C:\path\executable.exe" */ p = wcsrchr(UtilityProgramDirectory, L'\\');

12 years, 2 months

[hbelusca] 57533: [MSVCRT:APITEST] Update a comment. No code changes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 10 21:23:49 2012 New Revision: 57533 URL: http://svn.reactos.org/svn/reactos?rev=57533&view=rev Log: [MSVCRT:APITEST] Update a comment. No code changes. Modified: trunk/rostests/apitests/msvcrt/CommandLine.c Modified: trunk/rostests/apitests/msvcrt/CommandLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLi… ============================================================================== --- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Wed Oct 10 21:23:49 2012 @@ -135,6 +135,7 @@ if (TestCase->bEncloseProgramNameInQuotes && bWasntInQuotes) wcscat(CmdLine, L"\""); + /* Add a separating space and copy the tested command line parameters. */ wcscat(CmdLine, L" "); wcscat(CmdLine, TestCase->CmdLine); @@ -306,7 +307,7 @@ wcscat(UtilityProgramDirectory, L"data\\CmdLineUtil.exe"); - /* Close the opened quote if needed, and add a separating space */ + /* Close the opened quote if needed. */ if (UtilityProgramDirectory[0] == L'"') wcscat(UtilityProgramDirectory, L"\"");

12 years, 2 months

[hbelusca] 57532: [BOOTDATA] Remove unneeded %SystemRoot%\bin\data value in PATH environment variable.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 10 21:20:25 2012 New Revision: 57532 URL: http://svn.reactos.org/svn/reactos?rev=57532&view=rev Log: [BOOTDATA] Remove unneeded %SystemRoot%\bin\data value in PATH environment variable. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Wed Oct 10 21:20:25 2012 @@ -1200,7 +1200,7 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Wed Oct 10 21:20:25 2012 @@ -755,7 +755,7 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Oct 10 21:20:25 2012 @@ -1200,7 +1200,7 @@ ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP"

12 years, 2 months

[hbelusca] 57531: [MSVCRT:APITEST] Update CommandLine test.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 10 21:19:45 2012 New Revision: 57531 URL: http://svn.reactos.org/svn/reactos?rev=57531&view=rev Log: [MSVCRT:APITEST] Update CommandLine test. Modified: trunk/rostests/apitests/msvcrt/CommandLine.c Modified: trunk/rostests/apitests/msvcrt/CommandLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLi… ============================================================================== --- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Wed Oct 10 21:19:45 2012 @@ -86,26 +86,29 @@ return; } - +/******************************************************************************/ + +/* The path to the utility program run by this test. */ +static WCHAR UtilityProgramDirectory[MAX_PATH]; + +/* The list of tests. */ typedef struct _TEST_CASE { LPWSTR CmdLine; + BOOL bEncloseProgramNameInQuotes; } TEST_CASE, *PTEST_CASE; static TEST_CASE TestCases[] = { - {L"CmdLineUtil.exe"}, - {L"CmdLineUtil.exe foo bar"}, - {L"CmdLineUtil.exe \"foo bar\""}, - {L"CmdLineUtil.exe foo \"bar John\" Doe"}, - - {L"\"CmdLineUtil.exe\""}, - {L"\"CmdLineUtil.exe\" foo bar"}, - {L"\"CmdLineUtil.exe\" \"foo bar\""}, - {L"\"CmdLineUtil.exe\" foo \"bar John\" Doe"}, - - {L"\"CmdLineUtil.exe\""}, - {L"\"CmdLineUtil.exe \"foo bar\"\""}, + {L"", FALSE}, + {L"foo bar", FALSE}, + {L"\"foo bar\"", FALSE}, + {L"foo \"bar John\" Doe", FALSE}, + + {L"", TRUE}, + {L"foo bar", TRUE}, + {L"\"foo bar\"", TRUE}, + {L"foo \"bar John\" Doe", TRUE}, }; static void Test_CommandLine(IN ULONG TestNumber, @@ -113,7 +116,8 @@ { BOOL bRet; - WCHAR CmdLine[MAX_PATH]; + BOOL bWasntInQuotes = (UtilityProgramDirectory[0] != L'"'); + WCHAR CmdLine[MAX_PATH] = L""; STARTUPINFOW si; PROCESS_INFORMATION pi; @@ -121,7 +125,19 @@ ZeroMemory(&pi, sizeof(pi)); si.cb = sizeof(si); - wcscpy(CmdLine, TestCase->CmdLine); + + /* Initialize the command line. */ + if (TestCase->bEncloseProgramNameInQuotes && bWasntInQuotes) + wcscpy(CmdLine, L"\""); + + wcscat(CmdLine, UtilityProgramDirectory); + + if (TestCase->bEncloseProgramNameInQuotes && bWasntInQuotes) + wcscat(CmdLine, L"\""); + + wcscat(CmdLine, L" "); + wcscat(CmdLine, TestCase->CmdLine); + /* * Launch the utility program and wait till it's terminated. @@ -133,7 +149,7 @@ CREATE_UNICODE_ENVIRONMENT, NULL, NULL, &si, &pi); - ok(bRet, "Test %lu - Failed to launch ' %S ', error = %lu.\n", TestNumber, TestCase->CmdLine, GetLastError()); + ok(bRet, "Test %lu - Failed to launch ' %S ', error = %lu.\n", TestNumber, CmdLine, GetLastError()); if (bRet) { @@ -269,6 +285,34 @@ { ULONG i; + DWORD dwError; + LPWSTR p = NULL; + + + /* + * Initialize the UtilityProgramDirectory variable. + */ + GetModuleFileNameW(NULL, UtilityProgramDirectory, COUNT_OF(UtilityProgramDirectory)); + dwError = GetLastError(); + ok(dwError == ERROR_SUCCESS, "ERROR: Cannot retrieve the path to the current running process, last error %lu\n", dwError); + if (dwError != ERROR_SUCCESS) return; + + /* Path : executable.exe or "executable.exe" or C:\path\executable.exe or "C:\path\executable.exe" */ + p = wcsrchr(UtilityProgramDirectory, L'\\'); + if (p && *p != 0) + *++p = 0; /* Null-terminate there : C:\path\ or "C:\path\ */ + else + UtilityProgramDirectory[0] = 0; /* Suppress the executable.exe name */ + + wcscat(UtilityProgramDirectory, L"data\\CmdLineUtil.exe"); + + /* Close the opened quote if needed, and add a separating space */ + if (UtilityProgramDirectory[0] == L'"') wcscat(UtilityProgramDirectory, L"\""); + + + /* + * Now launch the tests. + */ for (i = 0 ; i < COUNT_OF(TestCases) ; ++i) { Test_CommandLine(i, &TestCases[i]);

12 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2012