Ros-diffs October 2016

ros-diffs@reactos.org

20 participants
222 discussions

[phater] 72953: [MSAFD] We support AF_INET, SOCK_RAW, IPPROTO_RAW and IF_INET, SOCK_RAW, IPPROTO_TCP triples also. Enable them in winsock mapping registry. CORE-12104

by phater＠svn.reactos.org

Author: phater Date: Mon Oct 10 08:00:20 2016 New Revision: 72953 URL: http://svn.reactos.org/svn/reactos?rev=72953&view=rev Log: [MSAFD] We support AF_INET,SOCK_RAW,IPPROTO_RAW and IF_INET,SOCK_RAW,IPPROTO_TCP triples also. Enable them in winsock mapping registry. CORE-12104 Modified: trunk/reactos/media/inf/nettcpip.inf Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== --- trunk/reactos/media/inf/nettcpip.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/nettcpip.inf [iso-8859-1] Mon Oct 10 08:00:20 2016 @@ -37,7 +37,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MaxSockAddrLength",0x00010001,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MinSockAddrLength",0x00010001,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","HelperDllName",0x00000000,"%SystemRoot%\System32\wshtcpip.dll" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000001,0c,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00,02,00,00,00,03,00,00,00,01,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000001,0e,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00,02,00,00,00,03,00,00,00,01,00,00,00,02,00,00,00,03,00,00,00,ff,00,00,00,02,00,00,00,03,00,00,00,06,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Winsock\Parameters","Transports",0x00010000,"Tcpip" HKLM,"SYSTEM\CurrentControlSet\Services\Winsock2\Parameters","AutodialDLL",0x00000000,"rasadhlp.dll" HKLM,"SYSTEM\CurrentControlSet\Services\Winsock2\Parameters","Current_NameSpace_Catalog",0x00000000,"NameSpace_Catalog5"

8 years, 2 months

[phater] 72952: [MSAFD] We support SOCK_RAW and IPPROTO_RAW also. CORE-12104

by phater＠svn.reactos.org

Author: phater Date: Mon Oct 10 07:57:34 2016 New Revision: 72952 URL: http://svn.reactos.org/svn/reactos?rev=72952&view=rev Log: [MSAFD] We support SOCK_RAW and IPPROTO_RAW also. CORE-12104 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Oct 10 07:57:34 2016 @@ -103,15 +103,43 @@ AddressFamily = AF_INET; if (SocketType == 0) - SocketType = SOCK_STREAM; + { + switch (Protocol) + { + case IPPROTO_TCP: + SocketType = SOCK_STREAM; + break; + case IPPROTO_UDP: + SocketType = SOCK_DGRAM; + break; + case IPPROTO_RAW: + SocketType = SOCK_RAW; + break; + default: + TRACE("Unknown Protocol (%d). We will try SOCK_STREAM.\n", Protocol); + SocketType = SOCK_STREAM; + break; + } + } if (Protocol == 0) { - if (SocketType == SOCK_STREAM) + switch (SocketType) + { + case SOCK_STREAM: Protocol = IPPROTO_TCP; - - if (SocketType == SOCK_DGRAM) + break; + case SOCK_DGRAM: Protocol = IPPROTO_UDP; + break; + case SOCK_RAW: + Protocol = IPPROTO_RAW; + break; + default: + TRACE("Unknown SocketType (%d). We will try IPPROTO_TCP.\n", SocketType); + Protocol = IPPROTO_TCP; + break; + } } /* Get Helper Data and Transport */

8 years, 2 months

[phater] 72951: [WINHTTP] Properly initialize winsock. Based on wine tests CORE-12104

by phater＠svn.reactos.org

Author: phater Date: Mon Oct 10 06:54:56 2016 New Revision: 72951 URL: http://svn.reactos.org/svn/reactos?rev=72951&view=rev Log: [WINHTTP] Properly initialize winsock. Based on wine tests CORE-12104 Modified: trunk/reactos/dll/win32/winhttp/net.c trunk/reactos/dll/win32/winhttp/session.c Modified: trunk/reactos/dll/win32/winhttp/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/net.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] Mon Oct 10 06:54:56 2016 @@ -276,6 +276,28 @@ return ret; } +#ifdef __REACTOS__ +static BOOL winsock_initialized = FALSE; +BOOL netconn_init_winsock() +{ + WSADATA wsaData; + int error; + if (!winsock_initialized) + { + error = WSAStartup(MAKEWORD(1, 1), &wsaData); + if (error) + { + ERR("WSAStartup failed: %d\n", error); + return FALSE; + } + else + winsock_initialized = TRUE; + } + return winsock_initialized; +} + +#endif + BOOL netconn_init( netconn_t *conn ) { memset(conn, 0, sizeof(*conn)); @@ -290,6 +312,10 @@ DeleteCriticalSection(&init_sechandle_cs); #ifndef HAVE_GETADDRINFO DeleteCriticalSection(&cs_gethostbyname); +#endif +#ifdef __REACTOS__ + if(winsock_initialized) + WSACleanup(); #endif } Modified: trunk/reactos/dll/win32/winhttp/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/session.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/session.c [iso-8859-1] Mon Oct 10 06:54:56 2016 @@ -83,9 +83,6 @@ heap_free( session->proxy_username ); heap_free( session->proxy_password ); heap_free( session ); -#ifdef __REACTOS__ - WSACleanup(); -#endif } static BOOL session_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) @@ -194,6 +191,9 @@ session_set_option }; +#ifdef __REACTOS__ +BOOL netconn_init_winsock(); +#endif /* __REACTOS__ */ /*********************************************************************** * WinHttpOpen (winhttp.@) */ @@ -202,9 +202,7 @@ session_t *session; HINTERNET handle = NULL; #ifdef __REACTOS__ - WSADATA wsaData; - int error = WSAStartup(MAKEWORD(2, 2), &wsaData); - if (error) ERR("WSAStartup failed: %d\n", error); + if (!netconn_init_winsock()) return NULL; #endif TRACE("%s, %u, %s, %s, 0x%08x\n", debugstr_w(agent), access, debugstr_w(proxy), debugstr_w(bypass), flags);

8 years, 2 months

[phater] 72950: [WININET] initialize winsock with proper version. Based on wine tests CORE-12104

by phater＠svn.reactos.org

Author: phater Date: Mon Oct 10 06:52:40 2016 New Revision: 72950 URL: http://svn.reactos.org/svn/reactos?rev=72950&view=rev Log: [WININET] initialize winsock with proper version. Based on wine tests CORE-12104 Modified: trunk/reactos/dll/win32/wininet/netconnection.c Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… ============================================================================== --- trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] Mon Oct 10 06:52:40 2016 @@ -259,7 +259,7 @@ WSADATA wsa_data; DWORD res; - res = WSAStartup(MAKEWORD(1,1), &wsa_data); + res = WSAStartup(MAKEWORD(2,2), &wsa_data); if(res == ERROR_SUCCESS) winsock_loaded = TRUE; else

8 years, 2 months

[phater] 72949: [WS2_32_APITESTS] Fix helper by not shutting down send. This way it breaks the test on windows also.

by phater＠svn.reactos.org

Author: phater Date: Mon Oct 10 06:48:56 2016 New Revision: 72949 URL: http://svn.reactos.org/svn/reactos?rev=72949&view=rev Log: [WS2_32_APITESTS] Fix helper by not shutting down send. This way it breaks the test on windows also. Modified: trunk/rostests/apitests/ws2_32/helpers.c Modified: trunk/rostests/apitests/ws2_32/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/helpers.c… ============================================================================== --- trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] Mon Oct 10 06:48:56 2016 @@ -54,10 +54,10 @@ /* Send the GET request */ SCKTEST(send(sck, szGetRequest, strlen(szGetRequest), 0)); ok(iResult == strlen(szGetRequest), "iResult = %d\n", iResult); - +#if 0 /* breaks windows too */ /* Shutdown the SEND connection */ SCKTEST(shutdown(sck, SD_SEND)); - +#endif /* Wait until we're ready to read */ FD_ZERO(&readable); FD_SET(sck, &readable);

8 years, 2 months

[phater] 72948: [MSAFD] Fix some return codes and better parameter checks based on wine tests CORE-12104

by phater＠svn.reactos.org

Author: phater Date: Mon Oct 10 06:38:52 2016 New Revision: 72948 URL: http://svn.reactos.org/svn/reactos?rev=72948&view=rev Log: [MSAFD] Fix some return codes and better parameter checks based on wine tests CORE-12104 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Oct 10 06:38:52 2016 @@ -2189,9 +2189,15 @@ else return NO_ERROR; case FIONREAD: - if( cbOutBuffer < sizeof(INT) || IS_INTRESOURCE(lpvOutBuffer) ) + if (IS_INTRESOURCE(lpvOutBuffer) || cbOutBuffer == 0) { + *lpcbBytesReturned = sizeof(ULONG); *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + if (cbOutBuffer < sizeof(ULONG)) + { + *lpErrno = WSAEINVAL; return SOCKET_ERROR; } *lpErrno = GetSocketInformation(Socket, AFD_INFO_RECEIVE_CONTENT_SIZE, NULL, (PULONG)lpvOutBuffer, NULL); @@ -2203,9 +2209,15 @@ return NO_ERROR; } case SIOCATMARK: - if (cbOutBuffer < sizeof(BOOL) || IS_INTRESOURCE(lpvOutBuffer)) + if (IS_INTRESOURCE(lpvOutBuffer) || cbOutBuffer == 0) { + *lpcbBytesReturned = sizeof(BOOL); *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + if (cbOutBuffer < sizeof(BOOL)) + { + *lpErrno = WSAEINVAL; return SOCKET_ERROR; } @@ -2220,16 +2232,28 @@ return SOCKET_ERROR; case SIO_ADDRESS_LIST_QUERY: - if (cbOutBuffer < (sizeof(SOCKET_ADDRESS_LIST) + sizeof(Socket->SharedData->WSLocalAddress)) || IS_INTRESOURCE(lpvOutBuffer)) + if (IS_INTRESOURCE(lpvOutBuffer) || cbOutBuffer == 0) + { + *lpcbBytesReturned = sizeof(SOCKET_ADDRESS_LIST) + sizeof(Socket->SharedData->WSLocalAddress); + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + if (cbOutBuffer < sizeof(INT)) { *lpErrno = WSAEINVAL; return SOCKET_ERROR; } - *lpcbBytesReturned = sizeof(SOCKET_ADDRESS_LIST) + - sizeof(Socket->SharedData->WSLocalAddress); + *lpcbBytesReturned = sizeof(SOCKET_ADDRESS_LIST) + sizeof(Socket->SharedData->WSLocalAddress); ((SOCKET_ADDRESS_LIST*)lpvOutBuffer)->iAddressCount = 1; + + if (cbOutBuffer < (sizeof(SOCKET_ADDRESS_LIST) + sizeof(Socket->SharedData->WSLocalAddress))) + { + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + ((SOCKET_ADDRESS_LIST*)lpvOutBuffer)->Address[0].iSockaddrLength = sizeof(Socket->SharedData->WSLocalAddress); ((SOCKET_ADDRESS_LIST*)lpvOutBuffer)->Address[0].lpSockaddr = &Socket->SharedData->WSLocalAddress; @@ -2684,7 +2708,7 @@ if (*lpdwAddressStringLength < size) { *lpdwAddressStringLength = size; - *lpErrno = WSAENOBUFS; + *lpErrno = WSAEFAULT; return SOCKET_ERROR; }

8 years, 2 months

[mjansen] 72947: RegQueryValueExW and RegQueryValueExA calls accept bytes. Patch by Victor Martinez Calvo. CORE-9665 #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Oct 9 20:58:08 2016 New Revision: 72947 URL: http://svn.reactos.org/svn/reactos?rev=72947&view=rev Log: RegQueryValueExW and RegQueryValueExA calls accept bytes. Patch by Victor Martinez Calvo. CORE-9665 #comment Thanks! Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/rapps/installed.c trunk/reactos/base/applications/rapps_new/installed.cpp trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/taskmgr/procpage.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/winlogon/setup.c trunk/reactos/dll/cpl/wined3dcfg/general.c trunk/reactos/dll/win32/avicap32/avicap32.c trunk/reactos/dll/win32/powrprof/powrprof.c trunk/reactos/dll/win32/secur32/sspi.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/interface.c trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/winmm/playsound.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -138,7 +138,7 @@ if(RegOpenKeyExW(hKey, szName, 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) break; - dwSize = MAXVALUE; + dwSize = MAXVALUE * sizeof(WCHAR); if(RegQueryValueExW(hKey, L"UsernameHint", 0, NULL, (LPBYTE)szValue, &dwSize) == ERROR_SUCCESS) { @@ -185,7 +185,7 @@ NULL); if (ret == ERROR_SUCCESS) { - size = MAX_KEY_NAME; + size = sizeof(Name); if (RegQueryValueExW(hKey, Name, 0, Modified: trunk/reactos/base/applications/rapps/installed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… ============================================================================== --- trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -11,7 +11,7 @@ BOOL GetApplicationString(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpString) { - DWORD dwSize = MAX_PATH; + DWORD dwSize = MAX_PATH * sizeof(WCHAR); if (RegQueryValueExW(hKey, lpKeyName, @@ -50,7 +50,7 @@ if (RegOpenKeyW(hKey, szName, &hSubKey) == ERROR_SUCCESS) { dwType = REG_SZ; - dwSize = MAX_PATH; + dwSize = sizeof(szDisplayName); if (RegQueryValueExW(hSubKey, L"DisplayName", NULL, @@ -118,7 +118,7 @@ hKey = ItemInfo->hSubKey; dwType = REG_SZ; - dwSize = MAX_PATH; + dwSize = sizeof(szPath); if (RegQueryValueExW(hKey, bModify ? szModify : szUninstall, NULL, @@ -254,7 +254,7 @@ } dwType = REG_SZ; - dwSize = MAX_PATH; + dwSize = sizeof(pszParentKeyName); bIsUpdate = (RegQueryValueExW(Info.hSubKey, L"ParentKeyName", NULL, @@ -262,7 +262,7 @@ (LPBYTE)pszParentKeyName, &dwSize) == ERROR_SUCCESS); - dwSize = MAX_PATH; + dwSize = sizeof(pszDisplayName); if (RegQueryValueExW(Info.hSubKey, L"DisplayName", NULL, Modified: trunk/reactos/base/applications/rapps_new/installed.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/installed.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/installed.cpp [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -11,7 +11,7 @@ BOOL GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR lpString) { - DWORD dwSize = MAX_PATH; + DWORD dwSize = MAX_PATH * sizeof(WCHAR); if (RegQueryValueExW(hKey, lpKeyName, @@ -50,7 +50,7 @@ if (RegOpenKeyW(hKey, szName, &hSubKey) == ERROR_SUCCESS) { dwType = REG_SZ; - dwSize = MAX_PATH; + dwSize = sizeof(szDisplayName); if (RegQueryValueExW(hSubKey, L"DisplayName", NULL, @@ -118,7 +118,7 @@ hKey = ItemInfo->hSubKey; dwType = REG_SZ; - dwSize = MAX_PATH; + dwSize = sizeof(szPath); if (RegQueryValueExW(hKey, bModify ? szModify : szUninstall, NULL, @@ -254,7 +254,7 @@ } dwType = REG_SZ; - dwSize = MAX_PATH; + dwSize = sizeof(pszParentKeyName); bIsUpdate = (RegQueryValueExW(Info.hSubKey, L"ParentKeyName", NULL, @@ -262,7 +262,7 @@ (LPBYTE)pszParentKeyName, &dwSize) == ERROR_SUCCESS); - dwSize = MAX_PATH; + dwSize = sizeof(pszDisplayName); if (RegQueryValueExW(Info.hSubKey, L"DisplayName", NULL, Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -774,7 +774,7 @@ if (RegOpenKeyExW(HKEY_CURRENT_USER, s_szFavoritesRegKey, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) goto done; - cbData = (sizeof(szFavoritePath) / sizeof(szFavoritePath[0])) - 1; + cbData = sizeof(szFavoritePath); memset(szFavoritePath, 0, sizeof(szFavoritePath)); if (RegQueryValueExW(hKey, pszFavorite, NULL, &dwType, (LPBYTE) szFavoritePath, &cbData) != ERROR_SUCCESS) goto done; Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -390,7 +390,7 @@ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - dwDebuggerSize = 260; + dwDebuggerSize = sizeof(strDebugger); if (RegQueryValueExW(hKey, L"Debugger", NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) == ERROR_SUCCESS) { CharUpper(strDebugger); Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -841,7 +841,7 @@ if (dwError != ERROR_SUCCESS) return dwError; - dwSize = MAX_PATH; + dwSize = MAX_PATH * sizeof(WCHAR); /* Check for the DependOnService Value */ dwError = RegQueryValueExW(hServiceEnumKey, Modified: trunk/reactos/base/system/winlogon/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… ============================================================================== --- trunk/reactos/base/system/winlogon/setup.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/setup.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -80,7 +80,7 @@ return FALSE; /* Read key */ - dwSize = (sizeof(Shell) / sizeof(Shell[0])) - 1; + dwSize = sizeof(Shell); dwError = RegQueryValueExW(hKey, L"CmdLine", NULL, Modified: trunk/reactos/dll/cpl/wined3dcfg/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/general… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/general.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -51,7 +51,7 @@ void InitControl(HWND hWndDlg, HKEY hKey, PWCHAR szKey, PWINED3D_SETTINGS pSettings, INT iControlId, INT iCount) { WCHAR szBuffer[MAX_KEY_LENGTH]; - DWORD dwSize = MAX_KEY_LENGTH; + DWORD dwSize = sizeof(szBuffer); DWORD dwType = 0; INT iCurrent; INT iActive = 0; Modified: trunk/reactos/dll/win32/avicap32/avicap32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avicap32/avicap3… ============================================================================== --- trunk/reactos/dll/win32/avicap32/avicap32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avicap32/avicap32.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -179,7 +179,7 @@ { if (RegOpenKeyW(hKey, szDriver, &hSubKey) == ERROR_SUCCESS) { - dwSize = sizeof(szFileName) / sizeof(WCHAR); + dwSize = sizeof(szFileName); if (RegQueryValueExW(hSubKey, L"Driver", @@ -188,7 +188,7 @@ (LPBYTE)&szFileName, &dwSize) == ERROR_SUCCESS) { - dwSize = sizeof(szDriverName) / sizeof(WCHAR); + dwSize = sizeof(szDriverName); if (RegQueryValueExW(hSubKey, L"FriendlyName", Modified: trunk/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -299,7 +299,7 @@ return FALSE; } - dwSize = MAX_PATH; + dwSize = sizeof(szBuf); Err = RegQueryValueExW(hKey, L"CurrentPowerPolicy", NULL, NULL, (LPBYTE)&szBuf, &dwSize); Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -531,7 +531,7 @@ if (apiRet == ERROR_SUCCESS) { WCHAR securityPkgNames[MAX_PATH]; /* arbitrary len */ - DWORD size = sizeof(securityPkgNames) / sizeof(WCHAR), type; + DWORD size = sizeof(securityPkgNames), type; apiRet = RegQueryValueExW(key, securityProvidersW, NULL, &type, (PBYTE)securityPkgNames, &size); Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -228,7 +228,8 @@ if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return; if (type != REG_MULTI_SZ) return; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size + str_size) * sizeof(WCHAR) ))) return; + size = size + str_size * sizeof(WCHAR) ; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size))) return; if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)buffer, &size )) goto done; /* compare each string against all the existing ones */ @@ -271,7 +272,7 @@ if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return; if (type != REG_MULTI_SZ) return; /* allocate double the size, one for value before and one for after */ - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size * 2 * sizeof(WCHAR) ))) return; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size * 2))) return; if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)buffer, &size )) goto done; src = buffer; dst = buffer + size; Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -232,7 +232,7 @@ /* Step 2. Create an interface list for this element */ HeapFree(GetProcessHeap(), 0, pSymbolicLink); - pSymbolicLink = HeapAlloc(GetProcessHeap(), 0, (dwLength + 1) * sizeof(WCHAR)); + pSymbolicLink = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(WCHAR)); if (!pSymbolicLink) { rc = ERROR_NOT_ENOUGH_MEMORY; Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -81,7 +81,7 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, LPVOID pvData) { - DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH, dwExpDataLen; + DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH * sizeof(WCHAR), dwExpDataLen; TRACE("(hkey=%p,%s,%p)\n", hKey, debugstr_w(lpszValue), pvData); @@ -194,7 +194,7 @@ /* Get current theme configuration */ if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { TRACE("Loading theme config\n"); - buffsize = sizeof(tmp)/sizeof(tmp[0]); + buffsize = sizeof(tmp); if(!RegQueryValueExW(hKey, szThemeActive, NULL, NULL, (LPBYTE)tmp, &buffsize)) { bThemeActive = (tmp[0] != '0'); } @@ -202,10 +202,10 @@ bThemeActive = FALSE; TRACE("Failed to get ThemeActive: %d\n", GetLastError()); } - buffsize = sizeof(szCurrentColor)/sizeof(szCurrentColor[0]); + buffsize = sizeof(szCurrentColor); if(RegQueryValueExW(hKey, szColorName, NULL, NULL, (LPBYTE)szCurrentColor, &buffsize)) szCurrentColor[0] = '\0'; - buffsize = sizeof(szCurrentSize)/sizeof(szCurrentSize[0]); + buffsize = sizeof(szCurrentSize); if(RegQueryValueExW(hKey, szSizeName, NULL, NULL, (LPBYTE)szCurrentSize, &buffsize)) szCurrentSize[0] = '\0'; if (query_reg_path (hKey, szDllName, szCurrentTheme)) @@ -618,7 +618,7 @@ Result = RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey); if (Result == ERROR_SUCCESS) { - buffsize = sizeof(tmp)/sizeof(tmp[0]); + buffsize = sizeof(tmp); if (!RegQueryValueExW(hKey, szThemeActive, NULL, NULL, (LPBYTE)tmp, &buffsize)) bActive = (tmp[0] != '0'); RegCloseKey(hKey); Modified: trunk/reactos/dll/win32/winmm/playsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/playsound.… ============================================================================== --- trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] Sun Oct 9 20:58:08 2016 @@ -130,7 +130,7 @@ if (err != 0) goto none; } - count = sizeof(str)/sizeof(str[0]); + count = sizeof(str); err = RegQueryValueExW(hSnd, NULL, 0, &type, (LPBYTE)str, &count); RegCloseKey(hSnd); if (err != 0 || !*str) goto none;

8 years, 2 months

[mjansen] 72946: [MSCONFIG_NEW|SETUP/WELCOME] Capitalize "os" in "ReactOS" part 4 by Adam Stachowicz CORE-9558 #resolve #comment Last patch applied, thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Oct 9 20:20:10 2016 New Revision: 72946 URL: http://svn.reactos.org/svn/reactos?rev=72946&view=rev Log: [MSCONFIG_NEW|SETUP/WELCOME] Capitalize "os" in "ReactOS" part 4 by Adam Stachowicz CORE-9558 #resolve #comment Last patch applied, thanks! Modified: trunk/reactos/base/applications/msconfig_new/lang/mscfgtl/ro-RO.xml trunk/reactos/base/setup/welcome/lang/ms-MY.rc Modified: trunk/reactos/base/applications/msconfig_new/lang/mscfgtl/ro-RO.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/mscfgtl/ro-RO.xml [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/mscfgtl/ro-RO.xml [iso-8859-1] Sun Oct 9 20:20:10 2016 @@ -11,7 +11,7 @@ <TOOL _locID="Computer Management" NAME="Gestiune calculator" PATH="%windir%\System32\compmgmt.msc" DEFAULT_OPT="" ADV_OPT="" HELP="Inspectare Èi configurare sistem Èi componente."/> <TOOL _locID="System Information" NAME="InformaÈii de sistem" PATH="%windir%\System32\msinfo32.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Inspectare informaÈii avansate despre configuraÈia fizicÄ Èi de program."/> <TOOL _locID="Event Viewer" NAME="Observator de evenimente" PATH="%windir%\System32\eventvwr.exe" DEFAULT_OPT="" ADV_OPT="" HELP="Monitorizarea Èi depanarea mesajelor."/> - <TOOL _locID="Programs" NAME="Programe" PATH="%windir%\System32\appwiz.cpl" DEFAULT_OPT="" ADV_OPT="" HELP="Lansare, adÄugare sau eliminare de programe Èi componente Reactos."/> + <TOOL _locID="Programs" NAME="Programe" PATH="%windir%\System32\appwiz.cpl" DEFAULT_OPT="" ADV_OPT="" HELP="Lansare, adÄugare sau eliminare de programe Èi componente ReactOS."/> <TOOL _locID="System Properties" NAME="ProprietÄÈi de sistem" PATH="%windir%\System32\control.exe" DEFAULT_OPT="system" ADV_OPT="" HELP="AfiÈare informaÈii de bazÄ despre configuraÈia de sistem al calculatorului."/> <TOOL _locID="Internet Options" NAME="OpÈiuni de Internet" PATH="%windir%\System32\inetcpl.cpl" DEFAULT_OPT="" ADV_OPT="" HELP="AfiÈare opÈiune de Internet."/> <TOOL _locID="Internet Protocol Configuration" NAME="ConfiguraÈie protocol de Internet" PATH="%windir%\System32\cmd.exe" DEFAULT_OPT="/k %windir%\system32\ipconfig.exe" ADV_OPT="/k %windir%\system32\ipconfig.exe /all" HELP="AfiÈare Èi configurare proprietÄÈi ale adresei de reÈea."/> Modified: trunk/reactos/base/setup/welcome/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/ms… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/ms-MY.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/ms-MY.rc [iso-8859-1] Sun Oct 9 20:20:10 2016 @@ -7,7 +7,7 @@ /* Default settings */ STRINGTABLE BEGIN - IDS_APPTITLE "Reactos - Selamat Datang" + IDS_APPTITLE "ReactOS - Selamat Datang" IDS_DEFAULTTOPICTITLE "ReactOS" IDS_DEFAULTTOPICDESC "Selamat datang ke ReactOS Operating System.\n\nKlik tajuk di sebelah kiri." // IDS_CHECKTEXT "Show this dialog again"

8 years, 2 months

[bfreisen] 72945: [MSPAINT] get rid of all _stprintf occurrences and the respective magic number sized TCHAR arrays

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Sun Oct 9 11:42:37 2016 New Revision: 72945 URL: http://svn.reactos.org/svn/reactos?rev=72945&view=rev Log: [MSPAINT] get rid of all _stprintf occurrences and the respective magic number sized TCHAR arrays Modified: trunk/reactos/base/applications/mspaint/dialogs.cpp trunk/reactos/base/applications/mspaint/dib.cpp trunk/reactos/base/applications/mspaint/imgarea.cpp trunk/reactos/base/applications/mspaint/registry.cpp trunk/reactos/base/applications/mspaint/selection.cpp trunk/reactos/base/applications/mspaint/sizebox.cpp Modified: trunk/reactos/base/applications/mspaint/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/dialogs.cpp [iso-8859-1] Sun Oct 9 11:42:37 2016 @@ -76,9 +76,6 @@ { case WM_INITDIALOG: { - TCHAR strrc[100]; - TCHAR res[100]; - widthSetInDlg = imageModel.GetWidth(); heightSetInDlg = imageModel.GetHeight(); @@ -90,20 +87,19 @@ if (isAFile) { TCHAR date[100]; - TCHAR size[100]; TCHAR temp[100]; GetDateFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, date, SIZEOF(date)); GetTimeFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, temp, SIZEOF(temp)); _tcscat(date, _T(" ")); _tcscat(date, temp); - LoadString(hProgInstance, IDS_FILESIZE, strrc, SIZEOF(strrc)); - _stprintf(size, strrc, fileSize); + CString strSize; + strSize.Format(IDS_FILESIZE, fileSize); SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT6, date); - SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT7, size); - } - LoadString(hProgInstance, IDS_PRINTRES, strrc, SIZEOF(strrc)); - _stprintf(res, strrc, fileHPPM, fileVPPM); - SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT8, res); + SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT7, strSize); + } + CString strRes; + strRes.Format(IDS_PRINTRES, fileHPPM, fileVPPM); + SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT8, strRes); return TRUE; } case WM_CLOSE: @@ -128,20 +124,20 @@ break; case IDD_ATTRIBUTESRB1: { - TCHAR number[100]; - _stprintf(number, _T("%.3lf"), widthSetInDlg / (0.0254 * fileHPPM)); - SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, number); - _stprintf(number, _T("%.3lf"), heightSetInDlg / (0.0254 * fileVPPM)); - SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, number); + CString strNum; + strNum.Format(_T("%.3lf"), widthSetInDlg / (0.0254 * fileHPPM)); + SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, strNum); + strNum.Format(_T("%.3lf"), heightSetInDlg / (0.0254 * fileVPPM)); + SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, strNum); break; } case IDD_ATTRIBUTESRB2: { - TCHAR number[100]; - _stprintf(number, _T("%.3lf"), widthSetInDlg * 100.0 / fileHPPM); - SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, number); - _stprintf(number, _T("%.3lf"), heightSetInDlg * 100.0 / fileVPPM); - SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, number); + CString strNum; + strNum.Format(_T("%.3lf"), widthSetInDlg * 100.0 / fileHPPM); + SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, strNum); + strNum.Format(_T("%.3lf"), heightSetInDlg * 100.0 / fileVPPM); + SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, strNum); break; } case IDD_ATTRIBUTESRB3: Modified: trunk/reactos/base/applications/mspaint/dib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/dib.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/dib.cpp [iso-8859-1] Sun Oct 9 11:42:37 2016 @@ -73,13 +73,11 @@ void ShowFileLoadError(LPCTSTR name) { - TCHAR programname[20]; - TCHAR loaderrortext[100]; - TCHAR temptext[500]; - LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); - LoadString(hProgInstance, IDS_LOADERRORTEXT, loaderrortext, SIZEOF(loaderrortext)); - _stprintf(temptext, loaderrortext, name); - mainWindow.MessageBox(temptext, programname, MB_OK | MB_ICONEXCLAMATION); + CString strText; + strText.Format(IDS_LOADERRORTEXT, (LPCTSTR) name); + CString strProgramName; + strProgramName.LoadString(IDS_PROGRAMNAME); + mainWindow.MessageBox(strText, strProgramName, MB_OK | MB_ICONEXCLAMATION); } void Modified: trunk/reactos/base/applications/mspaint/imgarea.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/imgarea.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/imgarea.cpp [iso-8859-1] Sun Oct 9 11:42:37 2016 @@ -252,9 +252,9 @@ if (!drawing) { - TCHAR coordStr[100]; - _stprintf(coordStr, _T("%ld, %ld"), xNow, yNow); - SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr); + CString strCoord; + strCoord.Format(_T("%ld, %ld"), xNow, yNow); + SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) (LPCTSTR) strCoord); } } if (drawing) @@ -291,9 +291,9 @@ case TOOL_AIRBRUSH: case TOOL_SHAPE: { - TCHAR coordStr[100]; - _stprintf(coordStr, _T("%ld, %ld"), xNow, yNow); - SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr); + CString strCoord; + strCoord.Format(_T("%ld, %ld"), xNow, yNow); + SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) (LPCTSTR) strCoord); break; } } @@ -303,11 +303,11 @@ Invalidate(FALSE); if ((toolsModel.GetActiveTool() >= TOOL_TEXT) || (toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_FREESEL)) { - TCHAR sizeStr[100]; + CString strSize; if ((toolsModel.GetActiveTool() >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) yRel = xRel; - _stprintf(sizeStr, _T("%ld x %ld"), xRel, yRel); - SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); + strSize.Format(_T("%ld x %ld"), xRel, yRel); + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); } } if ((wParam & MK_RBUTTON) != 0) @@ -316,11 +316,11 @@ Invalidate(FALSE); if (toolsModel.GetActiveTool() >= TOOL_TEXT) { - TCHAR sizeStr[100]; + CString strSize; if ((toolsModel.GetActiveTool() >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) yRel = xRel; - _stprintf(sizeStr, _T("%ld x %ld"), xRel, yRel); - SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); + strSize.Format(_T("%ld x %ld"), xRel, yRel); + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); } } } Modified: trunk/reactos/base/applications/mspaint/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/registry.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/registry.cpp [iso-8859-1] Sun Oct 9 11:42:37 2016 @@ -46,15 +46,15 @@ CRegKey desktop; if (desktop.Open(HKEY_CURRENT_USER, _T("Control Panel\\Desktop")) == ERROR_SUCCESS) { - TCHAR szStyle[3], szTile[3]; + CString strStyle, strTile; desktop.SetStringValue(_T("Wallpaper"), szFileName); - _stprintf(szStyle, _T("%lu"), dwStyle); - _stprintf(szTile, _T("%lu"), dwTile); + strStyle.Format(_T("%lu"), dwStyle); + strTile.Format(_T("%lu"), dwTile); - desktop.SetStringValue(_T("WallpaperStyle"), szStyle); - desktop.SetStringValue(_T("TileWallpaper"), szTile); + desktop.SetStringValue(_T("WallpaperStyle"), strStyle); + desktop.SetStringValue(_T("TileWallpaper"), strTile); } } Modified: trunk/reactos/base/applications/mspaint/selection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/selection.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/selection.cpp [iso-8859-1] Sun Oct 9 11:42:37 2016 @@ -155,7 +155,6 @@ { if (m_bMoving) { - TCHAR sizeStr[100]; imageModel.ResetToPrevious(); m_ptFrac.x += GET_X_LPARAM(lParam) - m_ptPos.x; m_ptFrac.y += GET_Y_LPARAM(lParam) - m_ptPos.y; @@ -173,8 +172,9 @@ } selectionModel.ModifyDestRect(m_ptDelta, m_iAction); - _stprintf(sizeStr, _T("%d x %d"), selectionModel.GetDestRectWidth(), selectionModel.GetDestRectHeight()); - SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); + CString strSize; + strSize.Format(_T("%d x %d"), selectionModel.GetDestRectWidth(), selectionModel.GetDestRectHeight()); + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); if (toolsModel.GetActiveTool() == TOOL_TEXT) { Modified: trunk/reactos/base/applications/mspaint/sizebox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/sizebox.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/sizebox.cpp [iso-8859-1] Sun Oct 9 11:42:37 2016 @@ -42,7 +42,7 @@ { if (resizing) { - TCHAR sizeStr[100]; + CString strSize; short xRel; short yRel; int imgXRes = imageModel.GetWidth(); @@ -50,22 +50,22 @@ xRel = (GET_X_LPARAM(lParam) - xOrig) * 1000 / toolsModel.GetZoom(); yRel = (GET_Y_LPARAM(lParam) - yOrig) * 1000 / toolsModel.GetZoom(); if (m_hWnd == sizeboxLeftTop.m_hWnd) - _stprintf(sizeStr, _T("%d x %d"), imgXRes - xRel, imgYRes - yRel); + strSize.Format(_T("%d x %d"), imgXRes - xRel, imgYRes - yRel); if (m_hWnd == sizeboxCenterTop.m_hWnd) - _stprintf(sizeStr, _T("%d x %d"), imgXRes, imgYRes - yRel); + strSize.Format(_T("%d x %d"), imgXRes, imgYRes - yRel); if (m_hWnd == sizeboxRightTop.m_hWnd) - _stprintf(sizeStr, _T("%d x %d"), imgXRes + xRel, imgYRes - yRel); + strSize.Format(_T("%d x %d"), imgXRes + xRel, imgYRes - yRel); if (m_hWnd == sizeboxLeftCenter.m_hWnd) - _stprintf(sizeStr, _T("%d x %d"), imgXRes - xRel, imgYRes); + strSize.Format(_T("%d x %d"), imgXRes - xRel, imgYRes); if (m_hWnd == sizeboxRightCenter.m_hWnd) - _stprintf(sizeStr, _T("%d x %d"), imgXRes + xRel, imgYRes); + strSize.Format(_T("%d x %d"), imgXRes + xRel, imgYRes); if (m_hWnd == sizeboxLeftBottom.m_hWnd) - _stprintf(sizeStr, _T("%d x %d"), imgXRes - xRel, imgYRes + yRel); + strSize.Format(_T("%d x %d"), imgXRes - xRel, imgYRes + yRel); if (m_hWnd == sizeboxCenterBottom.m_hWnd) - _stprintf(sizeStr, _T("%d x %d"), imgXRes, imgYRes + yRel); + strSize.Format(_T("%d x %d"), imgXRes, imgYRes + yRel); if (m_hWnd == sizeboxRightBottom.m_hWnd) - _stprintf(sizeStr, _T("%d x %d"), imgXRes + xRel, imgYRes + yRel); - SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); + strSize.Format(_T("%d x %d"), imgXRes + xRel, imgYRes + yRel); + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); } return 0; }

8 years, 2 months

[hbelusca] 72944: [EVENTCREATE]: Update turkish translation, by Erdem Ersoy. CORE-12120 #resolve #comment Committed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 8 19:43:16 2016 New Revision: 72944 URL: http://svn.reactos.org/svn/reactos?rev=72944&view=rev Log: [EVENTCREATE]: Update turkish translation, by Erdem Ersoy. CORE-12120 #resolve #comment Committed, thanks! Modified: trunk/reactos/base/applications/cmdutils/eventcreate/lang/tr-TR.rc Modified: trunk/reactos/base/applications/cmdutils/eventcreate/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/eventcreate/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/eventcreate/lang/tr-TR.rc [iso-8859-1] Sat Oct 8 19:43:16 2016 @@ -62,7 +62,7 @@ IDS_LOG_NOT_FOUND """%s"" kaydÄ± yok. Olay oluÅturulamÄ±yor.\n" IDS_SOURCE_NOCREATE "KayÄ±t adÄ± belirtilmediÄinden yeni kaynak oluÅturulamÄ±yor.\nKayÄ±t adÄ±nÄ± belirtmek iÃ§in lÃ¼tfen /L seÃ§eneÄini kullanÄ±nÄ±z.\n" IDS_SOURCE_EXISTS "Kaynak ""%s"" kaydÄ±nda Ã¶nceden var ve Ã§oÄaltÄ±lamaz.\n" - IDS_SOURCE_NOT_CUSTOM "The Source parameter is used to identify the custom scripts/applications\n(not the installed applications).\n" + IDS_SOURCE_NOT_CUSTOM "Kaynak deÄiÅkeni, husÃ»sÃ® betikleri veyÃ¢ husÃ»sÃ® uygulamalarÄ±\n(kurulu uygulamalarÄ± deÄil) belirlemek iÃ§in kullanÄ±lÄ±yor.\n" IDS_SUCCESS_1 "Ä°Ålem baÅarÄ±lÄ±: ""%s"" tÃ¼rÃ¼nde bir olay ""%s"" kaydÄ±nda oluÅturuldu.\n" IDS_SUCCESS_2 "Ä°Ålem baÅarÄ±lÄ±: ""%s"" tÃ¼rÃ¼nde bir olay ""%s"" kaynaÄÄ±yla oluÅturuldu.\n"

8 years, 2 months

← Newer
1
...
12
13
14
15
16
17
18
...
23
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 2016