Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[ekohl] 74006: [FONTVIEW] Implementation of the install button. Patch by Baruch Rutman. Fixes by Eric Kohl. CORE-7355 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Feb 28 23:00:19 2017 New Revision: 74006 URL: http://svn.reactos.org/svn/reactos?rev=74006&view=rev Log: [FONTVIEW] Implementation of the install button. Patch by Baruch Rutman. Fixes by Eric Kohl. CORE-7355 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/fontview/CMakeLists.txt trunk/reactos/base/applications/fontview/display.c trunk/reactos/base/applications/fontview/display.h trunk/reactos/base/applications/fontview/fontview.c Modified: trunk/reactos/base/applications/fontview/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/CMakeLists.txt [iso-8859-1] Tue Feb 28 23:00:19 2017 @@ -7,6 +7,6 @@ add_rc_deps(fontview.rc ${CMAKE_CURRENT_SOURCE_DIR}/ttf.ico) add_executable(fontview ${SOURCE} fontview.rc) set_module_type(fontview win32gui UNICODE) -add_importlibs(fontview comdlg32 gdi32 shell32 user32 msvcrt kernel32) +add_importlibs(fontview comdlg32 gdi32 shell32 user32 msvcrt kernel32 advapi32) add_pch(fontview precomp.h SOURCE) add_cd_file(TARGET fontview DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/display.c [iso-8859-1] Tue Feb 28 23:00:19 2017 @@ -521,6 +521,24 @@ return 0; } +LRESULT +Display_GetFullName(HWND hwnd, INT length, PWSTR ptr) +{ + DISPLAYDATA *pData; + INT len; + + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + + len = wcslen(pData->szTypeFaceName) + wcslen(pData->szFormat) + 2; + + if (ptr != NULL && length >= len) + { + swprintf(ptr, L"%s%s", pData->szTypeFaceName, pData->szFormat); + } + + return (LRESULT)len; +} + LRESULT CALLBACK DisplayProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -544,6 +562,9 @@ case FVM_SETSTRING: return Display_SetString(hwnd, (WCHAR *)lParam); + case FVM_GETFULLNAME: + return Display_GetFullName(hwnd, (INT)wParam, (PWSTR)lParam); + case WM_DESTROY: return Display_OnDestroy(hwnd); Modified: trunk/reactos/base/applications/fontview/display.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/display.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/display.h [iso-8859-1] Tue Feb 28 23:00:19 2017 @@ -3,6 +3,7 @@ /* Messages for the display class */ #define FVM_SETTYPEFACE WM_USER #define FVM_SETSTRING (WM_USER + 1) +#define FVM_GETFULLNAME (WM_USER + 2) /* Size restrictions */ #define MAX_STRING 100 Modified: trunk/reactos/base/applications/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] Tue Feb 28 23:00:19 2017 @@ -26,6 +26,7 @@ #include <winnls.h> #include <shellapi.h> #include <windowsx.h> +#include <winreg.h> #include "fontview.h" #include "resource.h" @@ -420,21 +421,83 @@ static LRESULT MainWnd_OnInstall(HWND hwnd) { - DWORD fontExists; - - /* First, we have to find out if the font still exists. */ - fontExists = GetFileAttributes(g_fileName); - if (fontExists != 0xFFFFFFFF) /* If the file does not exist */ - { - ErrorMsgBox(0, IDS_ERROR_NOFONT, g_fileName); - return -1; - } - - //CopyFile(g_fileName, NULL, TRUE); - - MessageBox(hwnd, TEXT("This function is unimplemented"), TEXT("Unimplemented"), MB_OK); - - return 0; + WCHAR szFullName[64]; + + WCHAR szSrcPath[MAX_PATH]; + WCHAR szDestPath[MAX_PATH]; + PWSTR pszFileName; + LONG res; + HKEY hKey; + + SendDlgItemMessage(hwnd, IDC_DISPLAY, FVM_GETFULLNAME, 64, (LPARAM)szFullName); +// MessageBoxW(hwnd, szFullName, L"Debug", MB_OK); + + /* First, we have to find out if the font still exists */ + if (GetFileAttributes(g_fileName) == INVALID_FILE_ATTRIBUTES) + { + /* Fail, if the source file does not exist */ + ErrorMsgBox(0, IDS_ERROR_NOFONT, g_fileName); + return -1; + } + + /* Build the full destination file name */ + GetFullPathNameW(g_fileName, MAX_PATH, szSrcPath, &pszFileName); + + GetWindowsDirectoryW(szDestPath, MAX_PATH); + wcscat(szDestPath, L"\\Fonts\\"); + wcscat(szDestPath, pszFileName); + + /* Debug Message */ +// MessageBoxW(hwnd, szDestPath, L"szDestPath", MB_OK); +// MessageBoxW(hwnd, pszFileName, L"pszFileExt", MB_OK); + + /* Check if the file already exists */ + if (GetFileAttributesW(szDestPath) != INVALID_FILE_ATTRIBUTES) + { + MessageBoxW(hwnd, L"This font is already installed!", L"Already Installed", MB_OK); + return 0; + } + + /* Copy the font file */ + if (!CopyFileW(g_fileName, szDestPath, TRUE)) + { + MessageBoxW(hwnd,L"Failed to copy the font file!", L"File Error", MB_OK); + return -1; + } + + /* Open the fonts key */ + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", + 0, + KEY_ALL_ACCESS, + &hKey); + if (res != ERROR_SUCCESS) + { + MessageBoxW(hwnd, L"Failed top open the fonts key!", L"Debug1", MB_OK); + return -1; + } + + /* Register the font */ + res = RegSetValueExW(hKey, + szFullName, + 0, + REG_SZ, + (LPBYTE)pszFileName, + (wcslen(pszFileName) + 1) * sizeof(WCHAR)); + if (res != ERROR_SUCCESS) + { + MessageBoxW(hwnd, L"Failed to register the new font!", L"Debug2", MB_OK); + RegCloseKey(hKey); + return -1; + } + + /* Close the fonts key */ + RegCloseKey(hKey); + + /* if all of this goes correctly, message the user about success */ + MessageBoxW(hwnd, L"Font Installation Completed.", L"Success", MB_OK); + + return 0; } static LRESULT

7 years, 9 months

[hbelusca] 74005: [NTUSER]: NtUserGetObjectInformation, nIndex == UOI_FLAGS case: - Capture the ObjectFlags to be set in a local variable, - Then copy its contents in the mem area pointed by pvInfo...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Feb 28 20:49:37 2017 New Revision: 74005 URL: http://svn.reactos.org/svn/reactos?rev=74005&view=rev Log: [NTUSER]: NtUserGetObjectInformation, nIndex == UOI_FLAGS case: - Capture the ObjectFlags to be set in a local variable, - Then copy its contents in the mem area pointed by pvInformation *under the SEH block*! This allows: * protection if pvInformation is an invalid pointer; * avoid to run the "RtlCopyMemory(pvInformation, pvData, nDataSize);" afterwards with pvData == NULL. Modified: trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Tue Feb 28 20:49:37 2017 @@ -671,9 +671,10 @@ DWORD nLength, PDWORD nLengthNeeded) { - PWINSTATION_OBJECT WinStaObject; + NTSTATUS Status; + PWINSTATION_OBJECT WinStaObject = NULL; PDESKTOP DesktopObject = NULL; - NTSTATUS Status; + USEROBJECTFLAGS ObjectFlags; PVOID pvData = NULL; DWORD nDataSize = 0; @@ -690,7 +691,7 @@ } _SEH2_END; - /* try windowstation */ + /* Try window station */ TRACE("Trying to open window station %p\n", hObject); Status = ObReferenceObjectByHandle(hObject, 0, @@ -701,7 +702,7 @@ if (Status == STATUS_OBJECT_TYPE_MISMATCH) { - /* try desktop */ + /* Try desktop */ TRACE("Trying to open desktop %p\n", hObject); WinStaObject = NULL; Status = IntValidateDesktopHandle(hObject, @@ -718,29 +719,25 @@ TRACE("WinSta or Desktop opened!!\n"); - /* get data */ + /* Get data */ switch (nIndex) { case UOI_FLAGS: - nDataSize = sizeof(USEROBJECTFLAGS); - if (nLength >= nDataSize) - { - PUSEROBJECTFLAGS ObjectFlags = pvInformation; - - ObjectFlags->fInherit = 0; - ObjectFlags->fReserved = 0; - ObjectFlags->dwFlags = 0; - - Status = STATUS_SUCCESS; - } - else - { - Status = STATUS_BUFFER_TOO_SMALL; - } + { + /* This is a default implementation that does almost nothing */ + ObjectFlags.fInherit = FALSE; + ObjectFlags.fReserved = FALSE; + ObjectFlags.dwFlags = 0; + + pvData = &ObjectFlags; + nDataSize = sizeof(ObjectFlags); + Status = STATUS_SUCCESS; ERR("UOI_FLAGS unimplemented!\n"); break; + } case UOI_NAME: + { if (WinStaObject != NULL) { pvData = WinStaObject->Name.Buffer; @@ -754,10 +751,14 @@ Status = STATUS_SUCCESS; } else + { Status = STATUS_INVALID_PARAMETER; + } break; + } case UOI_TYPE: + { if (WinStaObject != NULL) { pvData = L"WindowStation"; @@ -771,8 +772,11 @@ Status = STATUS_SUCCESS; } else + { Status = STATUS_INVALID_PARAMETER; + } break; + } case UOI_USER_SID: Status = STATUS_NOT_IMPLEMENTED; @@ -785,7 +789,7 @@ } Exit: - if (Status == STATUS_SUCCESS && nLength < nDataSize) + if ((Status == STATUS_SUCCESS) && (nLength < nDataSize)) Status = STATUS_BUFFER_TOO_SMALL; _SEH2_TRY @@ -793,7 +797,7 @@ if (nLengthNeeded) *nLengthNeeded = nDataSize; - /* try to copy data to caller */ + /* Try to copy data to caller */ if (Status == STATUS_SUCCESS) { TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize); @@ -806,11 +810,11 @@ } _SEH2_END; - /* release objects */ + /* Release objects */ + if (DesktopObject != NULL) + ObDereferenceObject(DesktopObject); if (WinStaObject != NULL) ObDereferenceObject(WinStaObject); - if (DesktopObject != NULL) - ObDereferenceObject(DesktopObject); if (!NT_SUCCESS(Status)) {

7 years, 9 months

[ekohl] 74004: [Fontview] Unicodify it. CORE-7355

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Feb 28 19:33:28 2017 New Revision: 74004 URL: http://svn.reactos.org/svn/reactos?rev=74004&view=rev Log: [Fontview] Unicodify it. CORE-7355 Modified: trunk/reactos/base/applications/fontview/CMakeLists.txt trunk/reactos/base/applications/fontview/display.c trunk/reactos/base/applications/fontview/fontview.c Modified: trunk/reactos/base/applications/fontview/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/CMakeLists.txt [iso-8859-1] Tue Feb 28 19:33:28 2017 @@ -6,7 +6,7 @@ add_rc_deps(fontview.rc ${CMAKE_CURRENT_SOURCE_DIR}/ttf.ico) add_executable(fontview ${SOURCE} fontview.rc) -set_module_type(fontview win32gui) +set_module_type(fontview win32gui UNICODE) add_importlibs(fontview comdlg32 gdi32 shell32 user32 msvcrt kernel32) add_pch(fontview precomp.h SOURCE) add_cd_file(TARGET fontview DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/display.c [iso-8859-1] Tue Feb 28 19:33:28 2017 @@ -468,7 +468,7 @@ pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); #endif docinfo.cbSize = sizeof(DOCINFO); - docinfo.lpszDocName = "Printing Font"; + docinfo.lpszDocName = L"Printing Font"; docinfo.lpszOutput = NULL; docinfo.lpszDatatype = NULL; docinfo.fwType = 0; Modified: trunk/reactos/base/applications/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] Tue Feb 28 19:33:28 2017 @@ -91,9 +91,9 @@ } int WINAPI -WinMain (HINSTANCE hThisInstance, +wWinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, + LPWSTR lpCmdLine, int nCmdShow) { int argc; @@ -423,7 +423,7 @@ DWORD fontExists; /* First, we have to find out if the font still exists. */ - fontExists = GetFileAttributes((LPCSTR)g_fileName); + fontExists = GetFileAttributes(g_fileName); if (fontExists != 0xFFFFFFFF) /* If the file does not exist */ { ErrorMsgBox(0, IDS_ERROR_NOFONT, g_fileName);

7 years, 9 months

[jimtabor] 74003: [NtUser] - Patch to level up scroll bar code, based on mudhead patch. See CORE-12827.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Feb 28 17:11:08 2017 New Revision: 74003 URL: http://svn.reactos.org/svn/reactos?rev=74003&view=rev Log: [NtUser] - Patch to level up scroll bar code, based on mudhead patch. See CORE-12827. Modified: trunk/reactos/win32ss/user/ntuser/scrollbar.c Modified: trunk/reactos/win32ss/user/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] Tue Feb 28 17:11:08 2017 @@ -750,7 +750,7 @@ break; default: EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + return FALSE; /* Nothing to do! */ } old_style = IntSetStyle( Wnd, set_bits, clear_bits ); @@ -761,11 +761,11 @@ //if (Wnd->style & WS_VSCROLL) IntUpdateSBInfo(Wnd, SB_VERT); ///// /* Frame has been changed, let the window redraw itself */ - co_WinPosSetWindowPos(Wnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | - SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOSENDCHANGING); + co_WinPosSetWindowPos( Wnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE + | SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); return TRUE; } - return FALSE; + return FALSE; /* no frame changes */ } static void

7 years, 9 months

[hbelusca] 74002: ReactOS 0.4.4 was successfully released: tag its branch!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Feb 28 16:25:10 2017 New Revision: 74002 URL: http://svn.reactos.org/svn/reactos?rev=74002&view=rev Log: ReactOS 0.4.4 was successfully released: tag its branch! Added: tags/ReactOS-0.4.4/ (props changed) - copied from r74001, branches/ros-branch-0_4_4/ Removed: branches/ros-branch-0_4_4/ Propchange: tags/ReactOS-0.4.4/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Feb 28 16:25:10 2017 @@ -0,0 +1 @@ +/branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595

7 years, 9 months

[akhaldi] 74001: [WININET_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 28 15:52:04 2017 New Revision: 74001 URL: http://svn.reactos.org/svn/reactos?rev=74001&view=rev Log: [WININET_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/wininet/http.c trunk/rostests/winetests/wininet/internet.c Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Tue Feb 28 15:52:04 2017 @@ -2468,6 +2468,10 @@ send(c, okmsg, sizeof(okmsg)-1, 0); send(c, buffer, strlen(buffer), 0); } + if (strstr(buffer, "GET /test_remove_dot_segments")) + { + send(c, okmsg, sizeof(okmsg)-1, 0); + } if (strstr(buffer, "HEAD /test_auth_host1")) { if (strstr(buffer, "Authorization: Basic dGVzdDE6cGFzcw==")) @@ -5129,6 +5133,20 @@ len = strlen(url); ok(size == len, "size = %u, expected %u\n", size, len); ok(!strcmp(buf, url), "Wrong URL %s, expected %s\n", buf, url); + + close_request(&req); +} + +static void test_remove_dot_segments(int port) +{ + test_request_t req; + BOOL ret; + + open_simple_request(&req, "localhost", port, NULL, "/A/../B/./C/../../test_remove_dot_segments"); + + ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req.request, 200); close_request(&req); } @@ -5184,6 +5202,7 @@ test_async_read(si.port); test_http_read(si.port); test_long_url(si.port); + test_remove_dot_segments(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit"); Modified: trunk/rostests/winetests/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/interne… ============================================================================== --- trunk/rostests/winetests/wininet/internet.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/internet.c [iso-8859-1] Tue Feb 28 15:52:04 2017 @@ -1202,7 +1202,7 @@ ok(len != 0, "len = 0\n"); ret = InternetSetOptionA(NULL, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0); - ok(ret, "InternetSetOptio(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + ok(ret, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); len = 1024; ret = InternetGetCookieA("http://www.example.com/test_end", NULL, NULL, &len);

7 years, 9 months

[akhaldi] 74000: [WININET] Sync with Wine Staging 2.2. CORE-12823 07e3181 wininet: Fix some spec file entries. 725b55d wininet: Get rid of no longer needed INTERNET_INVALID_PORT_NUMBER in get_serve...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 28 15:51:01 2017 New Revision: 74000 URL: http://svn.reactos.org/svn/reactos?rev=74000&view=rev Log: [WININET] Sync with Wine Staging 2.2. CORE-12823 07e3181 wininet: Fix some spec file entries. 725b55d wininet: Get rid of no longer needed INTERNET_INVALID_PORT_NUMBER in get_server. 0d22e43 wininet: Handle INTERNET_INVALID_PORT_NUMBER in HttpOpenRequest. 8c39694 wininet: Changed usage of UrlEscapeW to fit winapi behavior. b3d12a1 wininet: Canonicalize URL in HttpOpenRequest. 47ff954 wininet: Use return value of sprintf() instead of calling strlen() and simplify code. Modified: trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/wininet.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] Tue Feb 28 15:51:01 2017 @@ -250,9 +250,6 @@ { server_t *iter, *server = NULL; - if(port == INTERNET_INVALID_PORT_NUMBER) - port = INTERNET_DEFAULT_HTTP_PORT; - EnterCriticalSection(&connection_pool_cs); LIST_FOR_EACH_ENTRY(iter, &connection_pool, server_t, entry) { @@ -3388,10 +3385,8 @@ port = session->hostPort; if (port == INTERNET_INVALID_PORT_NUMBER) - { port = (session->hdr.dwFlags & INTERNET_FLAG_SECURE) ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; - } request->server = get_server(substrz(session->hostName), port, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); if(!request->server) { @@ -3406,13 +3401,14 @@ if (lpszObjectName && *lpszObjectName) { HRESULT rc; - - len = 0; - rc = UrlEscapeW(lpszObjectName, NULL, &len, URL_ESCAPE_SPACES_ONLY); + WCHAR dummy; + + len = 1; + rc = UrlCanonicalizeW(lpszObjectName, &dummy, &len, URL_ESCAPE_SPACES_ONLY); if (rc != E_POINTER) len = strlenW(lpszObjectName)+1; request->path = heap_alloc(len*sizeof(WCHAR)); - rc = UrlEscapeW(lpszObjectName, request->path, &len, + rc = UrlCanonicalizeW(lpszObjectName, request->path, &len, URL_ESCAPE_SPACES_ONLY); if (rc != S_OK) { @@ -4193,12 +4189,13 @@ request->path = NULL; if (*path) { - DWORD needed = 0; + DWORD needed = 1; HRESULT rc; - - rc = UrlEscapeW(path, NULL, &needed, URL_ESCAPE_SPACES_ONLY); - if (rc == E_POINTER) - needed = strlenW(path)+1; + WCHAR dummy = 0; + + rc = UrlEscapeW(path, &dummy, &needed, URL_ESCAPE_SPACES_ONLY); + if (rc != E_POINTER) + ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); request->path = heap_alloc(needed*sizeof(WCHAR)); rc = UrlEscapeW(path, request->path, &needed, URL_ESCAPE_SPACES_ONLY); Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] Tue Feb 28 15:51:01 2017 @@ -4098,8 +4098,7 @@ { char szPort[MAX_WORD_DIGITS+1]; - sprintf(szPort, "%d", lpUrlComponents->nPort); - *lpdwUrlLength += strlen(szPort); + *lpdwUrlLength += sprintf(szPort, "%d", lpUrlComponents->nPort); *lpdwUrlLength += strlen(":"); } @@ -4342,14 +4341,9 @@ if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) { - WCHAR szPort[MAX_WORD_DIGITS+1]; - - sprintfW(szPort, fmtW, lpUrlComponents->nPort); *lpszUrl = ':'; lpszUrl++; - dwLen = strlenW(szPort); - memcpy(lpszUrl, szPort, dwLen * sizeof(WCHAR)); - lpszUrl += dwLen; + lpszUrl += sprintfW(lpszUrl, fmtW, lpUrlComponents->nPort); } /* add slash between hostname and path if necessary */ Modified: trunk/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet.spec [iso-8859-1] Tue Feb 28 15:51:01 2017 @@ -80,10 +80,10 @@ @ stdcall FtpSetCurrentDirectoryW(ptr wstr) @ stdcall GetUrlCacheConfigInfoA(ptr ptr long) @ stdcall GetUrlCacheConfigInfoW(ptr ptr long) -@ stdcall GetUrlCacheEntryInfoA(str ptr long) +@ stdcall GetUrlCacheEntryInfoA(str ptr ptr) @ stdcall GetUrlCacheEntryInfoExA(str ptr ptr str ptr ptr long) @ stdcall GetUrlCacheEntryInfoExW(wstr ptr ptr wstr ptr ptr long) -@ stdcall GetUrlCacheEntryInfoW(wstr ptr long) +@ stdcall GetUrlCacheEntryInfoW(wstr ptr ptr) @ stdcall GetUrlCacheGroupAttributeA(int64 long long ptr ptr ptr) @ stdcall GetUrlCacheGroupAttributeW(int64 long long ptr ptr ptr) @ stub GetUrlCacheHeaderData Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Feb 28 15:51:01 2017 @@ -201,7 +201,7 @@ reactos/dll/win32/winemp3.acm # Synced to WineStaging-2.2 reactos/dll/win32/wing32 # Synced to WineStaging-1.9.11 reactos/dll/win32/winhttp # Synced to WineStaging-1.9.23 -reactos/dll/win32/wininet # Synced to WineStaging-1.9.23 +reactos/dll/win32/wininet # Synced to WineStaging-2.2 reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628

7 years, 9 months

[mjansen] 73999: [APPCOMPAT] Fix a memory leak in a failure case (CID 1401161), a 0-length memset that is detected 3 times (CID 1401069, 1401064, 1401062)

by mjansen＠svn.reactos.org

Author: mjansen Date: Mon Feb 27 18:54:57 2017 New Revision: 73999 URL: http://svn.reactos.org/svn/reactos?rev=73999&view=rev Log: [APPCOMPAT] Fix a memory leak in a failure case (CID 1401161), a 0-length memset that is detected 3 times (CID 1401069, 1401064, 1401062) Modified: trunk/reactos/dll/appcompat/apphelp/hsdb.c trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl Modified: trunk/reactos/dll/appcompat/apphelp/hsdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/hsdb… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/hsdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/hsdb.c [iso-8859-1] Mon Feb 27 18:54:57 2017 @@ -65,7 +65,9 @@ case SDB_DATABASE_MAIN_SHIM: name = shim; break; case SDB_DATABASE_MAIN_MSI: name = msi; break; case SDB_DATABASE_MAIN_DRIVERS: name = drivers; break; - default: return NULL; + default: + SdbReleaseDatabase(sdb); + return NULL; } SdbGetAppPatchDir(NULL, buffer, 128); memcpy(buffer + lstrlenW(buffer), name, SdbpStrlen(name)); Modified: trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl [iso-8859-1] Mon Feb 27 18:54:57 2017 @@ -39,7 +39,8 @@ SHIM_OBJ_NAME(g_szCommandLine) = ""; } SHIM_OBJ_NAME(g_pAPIHooks) = ShimLib_ShimMalloc(sizeof(HOOKAPI) * SHIM_NUM_HOOKS); - ZeroMemory(SHIM_OBJ_NAME(g_pAPIHooks), sizeof(HOOKAPI) * SHIM_NUM_HOOKS); + if (SHIM_NUM_HOOKS) + ZeroMemory(SHIM_OBJ_NAME(g_pAPIHooks), sizeof(HOOKAPI) * SHIM_NUM_HOOKS); *pdwHookCount = SHIM_NUM_HOOKS; #ifdef SHIM_NOTIFY_FN

7 years, 9 months

[ekohl] 73998: [REACTOS] Fix LoadSetupData() failure paths (properly). CORE-11691 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Feb 27 15:55:21 2017 New Revision: 73998 URL: http://svn.reactos.org/svn/reactos?rev=73998&view=rev Log: [REACTOS] Fix LoadSetupData() failure paths (properly). CORE-11691 #resolve Modified: trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Feb 27 15:55:21 2017 @@ -502,11 +502,12 @@ WCHAR szPath[MAX_PATH]; TCHAR tmp[10]; WCHAR *ch; - HINF hTxtsetupSif; + HINF hTxtsetupSif = INVALID_HANDLE_VALUE; INFCONTEXT InfContext; //TCHAR szValue[MAX_PATH]; DWORD LineLength; LONG Count; + BOOL ret = TRUE; GetModuleFileNameW(NULL,szPath,MAX_PATH); ch = strrchrW(szPath,L'\\'); @@ -532,28 +533,31 @@ if (pSetupData->LangCount > 0) { pSetupData->pLanguages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LANG) * pSetupData->LangCount); - if (pSetupData->pLanguages != NULL) - { - Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, _T("Language"), NULL, &InfContext)) - { - do - { - SetupGetStringField(&InfContext, - 0, - pSetupData->pLanguages[Count].LangId, - sizeof(pSetupData->pLanguages[Count].LangId) / sizeof(TCHAR), - &LineLength); - - SetupGetStringField(&InfContext, - 1, - pSetupData->pLanguages[Count].LangName, - sizeof(pSetupData->pLanguages[Count].LangName) / sizeof(TCHAR), - &LineLength); - ++Count; - } - while (SetupFindNextLine(&InfContext, &InfContext) && Count < pSetupData->LangCount); - } + if (pSetupData->pLanguages == NULL) + { + ret = FALSE; + goto done; + } + + Count = 0; + if (SetupFindFirstLine(hTxtsetupSif, _T("Language"), NULL, &InfContext)) + { + do + { + SetupGetStringField(&InfContext, + 0, + pSetupData->pLanguages[Count].LangId, + sizeof(pSetupData->pLanguages[Count].LangId) / sizeof(TCHAR), + &LineLength); + + SetupGetStringField(&InfContext, + 1, + pSetupData->pLanguages[Count].LangName, + sizeof(pSetupData->pLanguages[Count].LangName) / sizeof(TCHAR), + &LineLength); + ++Count; + } + while (SetupFindNextLine(&InfContext, &InfContext) && Count < pSetupData->LangCount); } } @@ -562,28 +566,31 @@ if (pSetupData->KbLayoutCount > 0) { pSetupData->pKbLayouts = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KBLAYOUT) * pSetupData->KbLayoutCount); - if (pSetupData->pKbLayouts != NULL) - { - Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, _T("KeyboardLayout"), NULL, &InfContext)) - { - do - { - SetupGetStringField(&InfContext, - 0, - pSetupData->pKbLayouts[Count].LayoutId, - sizeof(pSetupData->pKbLayouts[Count].LayoutId) / sizeof(TCHAR), - &LineLength); - - SetupGetStringField(&InfContext, - 1, - pSetupData->pKbLayouts[Count].LayoutName, - sizeof(pSetupData->pKbLayouts[Count].LayoutName) / sizeof(TCHAR), - &LineLength); - ++Count; - } - while (SetupFindNextLine(&InfContext, &InfContext) && Count < pSetupData->KbLayoutCount); - } + if (pSetupData->pKbLayouts == NULL) + { + ret = FALSE; + goto done; + } + + Count = 0; + if (SetupFindFirstLine(hTxtsetupSif, _T("KeyboardLayout"), NULL, &InfContext)) + { + do + { + SetupGetStringField(&InfContext, + 0, + pSetupData->pKbLayouts[Count].LayoutId, + sizeof(pSetupData->pKbLayouts[Count].LayoutId) / sizeof(TCHAR), + &LineLength); + + SetupGetStringField(&InfContext, + 1, + pSetupData->pKbLayouts[Count].LayoutName, + sizeof(pSetupData->pKbLayouts[Count].LayoutName) / sizeof(TCHAR), + &LineLength); + ++Count; + } + while (SetupFindNextLine(&InfContext, &InfContext) && Count < pSetupData->KbLayoutCount); } } @@ -596,22 +603,26 @@ { SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); for (Count = 0; Count < pSetupData->KbLayoutCount; Count++) + { if (_tcscmp(tmp, pSetupData->pKbLayouts[Count].LayoutId) == 0) { pSetupData->DefaultKBLayout = Count; break; } + } } if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"), _T("DefaultLanguage"), &InfContext)) { SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); for (Count = 0; Count < pSetupData->LangCount; Count++) + { if (_tcscmp(tmp, pSetupData->pLanguages[Count].LangId) == 0) { pSetupData->DefaultLang = Count; break; } + } } // get computers list @@ -632,9 +643,27 @@ sizeof(pSetupData->InstallDir) / sizeof(TCHAR), &LineLength); } - SetupCloseInfFile(hTxtsetupSif); - - return TRUE; + +done: + if (ret == FALSE) + { + if (pSetupData->pKbLayouts != NULL) + { + HeapFree(GetProcessHeap(), 0, pSetupData->pKbLayouts); + pSetupData->pKbLayouts = NULL; + } + + if (pSetupData->pLanguages != NULL) + { + HeapFree(GetProcessHeap(), 0, pSetupData->pLanguages); + pSetupData->pLanguages = NULL; + } + } + + if (hTxtsetupSif != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hTxtsetupSif); + + return ret; } LONG LoadGenentry(HINF hinf,PCTSTR name,PGENENTRY *gen,PINFCONTEXT context)

7 years, 9 months

[ekohl] 73997: [USETUP] Scroll in partitions list doesn't work. Patch by thc. CORE-11895 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Feb 27 14:32:09 2017 New Revision: 73997 URL: http://svn.reactos.org/svn/reactos?rev=73997&view=rev Log: [USETUP] Scroll in partitions list doesn't work. Patch by thc. CORE-11895 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Mon Feb 27 14:32:09 2017 @@ -1935,6 +1935,27 @@ LastLine++; } + if (CurrentPartLineFound == FALSE) + { + Entry2 = DiskEntry->LogicalPartListHead.Flink; + while (Entry2 != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (PartEntry == List->CurrentPartition) + { + CurrentPartLineFound = TRUE; + } + + Entry2 = Entry2->Flink; + if (CurrentPartLineFound == FALSE) + { + CurrentPartLine++; + } + + LastLine++; + } + } + if (DiskEntry == List->CurrentDisk) { CurrentDiskLineFound = TRUE;

7 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2017