Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[akhaldi] 70933: [SHLWAPI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Sat Mar 5 10:21:38 2016 New Revision: 70933 URL: http://svn.reactos.org/svn/reactos?rev=70933&view=rev Log: [SHLWAPI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/shlwapi/ordinal.c trunk/rostests/winetests/shlwapi/url.c Modified: trunk/rostests/winetests/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/ordinal… ============================================================================== --- trunk/rostests/winetests/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/ordinal.c [iso-8859-1] Sat Mar 5 10:21:38 2016 @@ -76,6 +76,24 @@ static HRESULT (WINAPI *pSKAllocValueW)(DWORD, LPCWSTR, LPCWSTR, DWORD*, void**, DWORD*); static HWND (WINAPI *pSHSetParentHwnd)(HWND, HWND); static HRESULT (WINAPI *pIUnknown_GetClassID)(IUnknown*, CLSID*); +static HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO2*); + +typedef struct SHELL_USER_SID { + SID_IDENTIFIER_AUTHORITY sidAuthority; + DWORD dwUserGroupID; + DWORD dwUserID; +} SHELL_USER_SID, *PSHELL_USER_SID; +typedef struct SHELL_USER_PERMISSION { + + SHELL_USER_SID susID; + DWORD dwAccessType; + BOOL fInherit; + DWORD dwAccessMask; + DWORD dwInheritMask; + DWORD dwInheritAccessMask; +} SHELL_USER_PERMISSION, *PSHELL_USER_PERMISSION; + +static SECURITY_DESCRIPTOR* (WINAPI *pGetShellSecurityDescriptor)(const SHELL_USER_PERMISSION**,int); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -522,6 +540,11 @@ ret = pSHFreeShared(hmem2, procid); ok(ret, "SHFreeShared failed: %u\n", GetLastError()); } + + SetLastError(0xdeadbeef); + ret = pSHFreeShared(NULL, procid); + ok(ret, "SHFreeShared failed: %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "last error should not have changed, got %u\n", GetLastError()); } static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) @@ -551,6 +574,11 @@ ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); /* test SHMapHandle */ + SetLastError(0xdeadbeef); + hmem2 = pSHMapHandle(NULL, procid, GetCurrentProcessId(), 0, 0); + ok(hmem2 == NULL, "expected NULL, got new handle\n"); + ok(GetLastError() == 0xdeadbeef, "last error should not have changed, got %u\n", GetLastError()); + hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0); /* It seems like Windows Vista/2008 uses a different internal implementation @@ -676,39 +704,22 @@ HeapFree(GetProcessHeap(), 0, mem); } - -typedef struct SHELL_USER_SID { - SID_IDENTIFIER_AUTHORITY sidAuthority; - DWORD dwUserGroupID; - DWORD dwUserID; -} SHELL_USER_SID, *PSHELL_USER_SID; -typedef struct SHELL_USER_PERMISSION { - SHELL_USER_SID susID; - DWORD dwAccessType; - BOOL fInherit; - DWORD dwAccessMask; - DWORD dwInheritMask; - DWORD dwInheritAccessMask; -} SHELL_USER_PERMISSION, *PSHELL_USER_PERMISSION; static void test_GetShellSecurityDescriptor(void) { - SHELL_USER_PERMISSION supCurrentUserFull = { + static const SHELL_USER_PERMISSION supCurrentUserFull = { { {SECURITY_NULL_SID_AUTHORITY}, 0, 0 }, ACCESS_ALLOWED_ACE_TYPE, FALSE, GENERIC_ALL, 0, 0 }; #define MY_INHERITANCE 0xBE /* invalid value to proof behavior */ - SHELL_USER_PERMISSION supEveryoneDenied = { + static const SHELL_USER_PERMISSION supEveryoneDenied = { { {SECURITY_WORLD_SID_AUTHORITY}, SECURITY_WORLD_RID, 0 }, ACCESS_DENIED_ACE_TYPE, TRUE, GENERIC_WRITE, MY_INHERITANCE | 0xDEADBA00, GENERIC_READ }; - PSHELL_USER_PERMISSION rgsup[2] = { + const SHELL_USER_PERMISSION* rgsup[2] = { &supCurrentUserFull, &supEveryoneDenied, }; SECURITY_DESCRIPTOR* psd; - SECURITY_DESCRIPTOR* (WINAPI*pGetShellSecurityDescriptor)(PSHELL_USER_PERMISSION*,int); void *pChrCmpIW = GetProcAddress(hShlwapi, "ChrCmpIW"); - - pGetShellSecurityDescriptor=(void*)GetProcAddress(hShlwapi,(char*)475); if(!pGetShellSecurityDescriptor) { @@ -3072,6 +3083,7 @@ MAKEFUNC(SHFormatDateTimeA, 353); MAKEFUNC(SHFormatDateTimeW, 354); MAKEFUNC(SHIShellFolder_EnumObjects, 404); + MAKEFUNC(GetShellSecurityDescriptor, 475); MAKEFUNC(SHGetObjectCompatFlags, 476); MAKEFUNC(IUnknown_QueryServiceExec, 484); MAKEFUNC(SHGetShellKey, 491); @@ -3082,6 +3094,8 @@ MAKEFUNC(SKDeleteValueW, 518); MAKEFUNC(SKAllocValueW, 519); #undef MAKEFUNC + + pDllGetVersion = (void*)GetProcAddress(hShlwapi, "DllGetVersion"); } static void test_SHSetParentHwnd(void) @@ -3253,6 +3267,14 @@ ok(hr == 0x8fff2222, "got 0x%08x\n", hr); ok(IsEqualCLSID(&clsid, &clsid2) || broken(IsEqualCLSID(&clsid, &clsid3)) /* win2k3 */, "got wrong clsid %s\n", wine_dbgstr_guid(&clsid)); +} + +static void test_DllGetVersion(void) +{ + HRESULT hr; + + hr = pDllGetVersion(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); } START_TEST(ordinal) @@ -3310,6 +3332,7 @@ test_SHGetShellKey(); test_SHSetParentHwnd(); test_IUnknown_GetClassID(); + test_DllGetVersion(); FreeLibrary(hshell32); FreeLibrary(hmlang); Modified: trunk/rostests/winetests/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/url.c?r… ============================================================================== --- trunk/rostests/winetests/shlwapi/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/url.c [iso-8859-1] Sat Mar 5 10:21:38 2016 @@ -315,6 +315,45 @@ {"ftp\x1f\1end/", 0, 0, S_OK, "ftp%1F%01end/"} }; +typedef struct _TEST_URL_ESCAPEW { + const WCHAR url[INTERNET_MAX_URL_LENGTH]; + DWORD flags; + HRESULT expectret; + const WCHAR expecturl[INTERNET_MAX_URL_LENGTH]; + const WCHAR win7url[INTERNET_MAX_URL_LENGTH]; /* <= Win7 */ + const WCHAR vistaurl[INTERNET_MAX_URL_LENGTH]; /* <= Vista/2k8 */ +} TEST_URL_ESCAPEW; + +static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { + {{' ','<','>','"',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','2','0','%','3','C','%','3','E','%','2','2',0}}, + {{'{','}','|','\\',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','7','B','%','7','D','%','7','C','%','5','C',0}}, + {{'^',']','[','`',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','5','E','%','5','D','%','5','B','%','6','0',0}}, + {{'&','/','?','#',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','2','6','/','?','#',0}}, + {{'M','a','s','s',0}, URL_ESCAPE_AS_UTF8, S_OK, {'M','a','s','s',0}}, + + /* broken < Win8/10 */ + + {{'M','a',0xdf,0}, URL_ESCAPE_AS_UTF8, S_OK, {'M','a','%','C','3','%','9','F',0}, + {'M','a','%','D','F',0}}, + /* 0x2070E */ + {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, + {0xd841,0xdf0e,0}}, + /* 0x27A3E */ + {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, + {0xd85e,0xde3e,0}}, + + {{0xd85e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D',0}, + {0xd85e,0}}, + {{0xd85e,0x41}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D','A',0}, + {0xd85e,'A',0}}, + {{0xdc00,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D',0}, + {0xdc00,0}}, + {{0xffff,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','F',0}, + {0xffff,0}}, +}; + /* ################ */ typedef struct _TEST_URL_COMBINE { @@ -885,6 +924,15 @@ ok(size == 34, "got %d, expected %d\n", size, 34); ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); + size = 1; + empty_string[0] = 127; + ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_AS_UTF8); + ok(ret == E_NOTIMPL || broken(ret == E_POINTER), /* < Win7/Win2k8 */ + "got %x, expected %x\n", ret, E_NOTIMPL); + ok(size == 1 || broken(size == 34), /* < Win7/Win2k8 */ + "got %d, expected %d\n", size, 1); + ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); + for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { CHAR ret_url[INTERNET_MAX_URL_LENGTH]; @@ -947,6 +995,21 @@ wine_dbgstr_w(expected_urlW), wine_dbgstr_w(ret_urlW), wine_dbgstr_w(urlW), TEST_ESCAPE[i].flags); FreeWideString(urlW); FreeWideString(expected_urlW); + } + + for(i=0; i<sizeof(TEST_ESCAPEW)/sizeof(TEST_ESCAPEW[0]); i++) { + WCHAR ret_url[INTERNET_MAX_URL_LENGTH]; + + size = INTERNET_MAX_URL_LENGTH; + ret = pUrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); + ok(ret == TEST_ESCAPEW[i].expectret, "UrlEscapeW returned 0x%08x instead of 0x%08x for \"%s\"\n", + ret, TEST_ESCAPEW[i].expectret, wine_dbgstr_w(TEST_ESCAPEW[i].url)); + ok(!lstrcmpW(ret_url, TEST_ESCAPEW[i].expecturl) || + broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].vistaurl)) || + broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].win7url)), + "Expected \"%s\" or \"%s\" or \"%s\", but got \"%s\" for \"%s\"\n", + wine_dbgstr_w(TEST_ESCAPEW[i].expecturl), wine_dbgstr_w(TEST_ESCAPEW[i].vistaurl), + wine_dbgstr_w(TEST_ESCAPEW[i].win7url), wine_dbgstr_w(ret_url), wine_dbgstr_w(TEST_ESCAPEW[i].url)); } }

1 0

[pschweitzer] 70934: [UBTRFS] Implement the utility DLL for the Btrfs file system
by pschweitzer＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: pschweitzer Date: Sat Mar 5 10:22:15 2016 New Revision: 70934 URL: http://svn.reactos.org/svn/reactos?rev=70934&view=rev Log: [UBTRFS] Implement the utility DLL for the Btrfs file system Added: trunk/reactos/dll/win32/ubtrfs/ trunk/reactos/dll/win32/ubtrfs/CMakeLists.txt (with props) trunk/reactos/dll/win32/ubtrfs/ubtrfs.c (with props) trunk/reactos/dll/win32/ubtrfs/ubtrfs.rc (with props) trunk/reactos/dll/win32/ubtrfs/ubtrfs.spec (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sat Mar 5 10:22:15 2016 @@ -207,6 +207,7 @@ add_subdirectory(themeui) add_subdirectory(traffic) add_subdirectory(twain_32) +add_subdirectory(ubtrfs) add_subdirectory(uext2) add_subdirectory(ufat) add_subdirectory(ufatx) Added: trunk/reactos/dll/win32/ubtrfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ubtrfs/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/ubtrfs/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/ubtrfs/CMakeLists.txt [iso-8859-1] Sat Mar 5 10:22:15 2016 @@ -0,0 +1,13 @@ + +spec2def(ubtrfs.dll ubtrfs.spec) + +list(APPEND SOURCE + ubtrfs.c + ubtrfs.rc + ${CMAKE_CURRENT_BINARY_DIR}/ubtrfs.def) + +add_library(ubtrfs SHARED ${SOURCE}) +set_module_type(ubtrfs nativedll) +target_link_libraries(ubtrfs btrfslib) +add_importlibs(ubtrfs ntdll) +add_cd_file(TARGET ubtrfs DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/ubtrfs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ubtrfs/ubtrfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ubtrfs/ubtrfs.c?… ============================================================================== --- trunk/reactos/dll/win32/ubtrfs/ubtrfs.c (added) +++ trunk/reactos/dll/win32/ubtrfs/ubtrfs.c [iso-8859-1] Sat Mar 5 10:22:15 2016 @@ -0,0 +1,23 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: BTRFS File System Management + * FILE: dll/win32/ubtrfs/ubtrfs.c + * PURPOSE: ubtrfs DLL initialisation + * + * PROGRAMMERS: Pierre Schweitzer + */ + +#include <windef.h> + +INT WINAPI +DllMain( + IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(hinstDLL); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpvReserved); + + return TRUE; +} Propchange: trunk/reactos/dll/win32/ubtrfs/ubtrfs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ubtrfs/ubtrfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ubtrfs/ubtrfs.rc… ============================================================================== --- trunk/reactos/dll/win32/ubtrfs/ubtrfs.rc (added) +++ trunk/reactos/dll/win32/ubtrfs/ubtrfs.rc [iso-8859-1] Sat Mar 5 10:22:15 2016 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "BTRFS File System Management" +#define REACTOS_STR_INTERNAL_NAME "ubtrfs" +#define REACTOS_STR_ORIGINAL_FILENAME "ubtrfs.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/ubtrfs/ubtrfs.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ubtrfs/ubtrfs.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ubtrfs/ubtrfs.sp… ============================================================================== --- trunk/reactos/dll/win32/ubtrfs/ubtrfs.spec (added) +++ trunk/reactos/dll/win32/ubtrfs/ubtrfs.spec [iso-8859-1] Sat Mar 5 10:22:15 2016 @@ -0,0 +1,2 @@ +@ stdcall ChkdskEx(ptr long long long long ptr) BtrfsChkdsk +@ stdcall FormatEx(ptr long ptr long long ptr) BtrfsFormat Propchange: trunk/reactos/dll/win32/ubtrfs/ubtrfs.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 70935: [AUTOCHK] Add support for the Btrfs file system CORE-10892
by pschweitzer＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: pschweitzer Date: Sat Mar 5 10:24:16 2016 New Revision: 70935 URL: http://svn.reactos.org/svn/reactos?rev=70935&view=rev Log: [AUTOCHK] Add support for the Btrfs file system CORE-10892 Modified: trunk/reactos/base/system/autochk/autochk.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Sat Mar 5 10:24:16 2016 @@ -271,6 +271,10 @@ { RtlInitUnicodeString(&ProviderDll, L"uext2.dll"); } + else if (wcscmp(FileSystem, L"Btrfs") == 0) + { + RtlInitUnicodeString(&ProviderDll, L"ubtrfs.dll"); + } else { return NULL;

1 0

[akhaldi] 70931: [SHLWAPI] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Sat Mar 5 10:20:00 2016 New Revision: 70931 URL: http://svn.reactos.org/svn/reactos?rev=70931&view=rev Log: [SHLWAPI] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/shlwapi_main.c trunk/reactos/dll/win32/shlwapi/stopwatch.c trunk/reactos/dll/win32/shlwapi/url.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Sat Mar 5 10:20:00 2016 @@ -78,6 +78,12 @@ TRACE("(%p,%d,%d,%08x,%08x)\n", hShared, dwDstProcId, dwSrcProcId, dwAccess, dwOptions); + if (!hShared) + { + TRACE("Returning handle NULL\n"); + return NULL; + } + /* Get dest process handle */ if (dwDstProcId == dwMyProcId) hDst = GetCurrentProcess(); @@ -238,6 +244,9 @@ HANDLE hClose; TRACE("(%p %d)\n", hShared, dwProcId); + + if (!hShared) + return TRUE; /* Get a copy of the handle for our process, closing the source handle */ hClose = SHMapHandle(hShared, dwProcId, GetCurrentProcessId(), @@ -4022,7 +4031,7 @@ case OS_SMALLBUSINESSSERVER: ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) case OS_TABLETPC: - FIXME("(OS_TABLEPC) What should we return here?\n"); + FIXME("(OS_TABLETPC) What should we return here?\n"); return FALSE; case OS_SERVERADMINUI: FIXME("(OS_SERVERADMINUI) What should we return here?\n"); @@ -4819,7 +4828,7 @@ * NOTES * Call should free returned descriptor with LocalFree */ -PSECURITY_DESCRIPTOR WINAPI GetShellSecurityDescriptor(PSHELL_USER_PERMISSION *apUserPerm, int cUserPerm) +PSECURITY_DESCRIPTOR WINAPI GetShellSecurityDescriptor(const PSHELL_USER_PERMISSION *apUserPerm, int cUserPerm) { PSID *sidlist; PSID cur_user = NULL; Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_main.c [iso-8859-1] Sat Mar 5 10:20:00 2016 @@ -85,6 +85,9 @@ TRACE("(%p)\n",pdvi); + if (!pdvi) + return E_INVALIDARG; + switch (pdvi2->info1.cbSize) { case sizeof(DLLVERSIONINFO2): @@ -98,7 +101,7 @@ pdvi2->info1.dwPlatformID = DLLVER_PLATFORM_WINDOWS; return S_OK; } - if (pdvi) - WARN("pdvi->cbSize = %d, unhandled\n", pdvi2->info1.cbSize); + + WARN("pdvi->cbSize = %d, unhandled\n", pdvi2->info1.cbSize); return E_INVALIDARG; } Modified: trunk/reactos/dll/win32/shlwapi/stopwatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/stopwatc… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/stopwatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/stopwatch.c [iso-8859-1] Sat Mar 5 10:20:00 2016 @@ -175,16 +175,16 @@ */ DWORD WINAPI GetPerfTime(void) { - static LONG64 iCounterFreq = 0; + static LARGE_INTEGER iCounterFreq = { {0} }; LARGE_INTEGER iCounter; TRACE("()\n"); - if (!iCounterFreq) - QueryPerformanceFrequency((LARGE_INTEGER*)&iCounterFreq); + if (!iCounterFreq.QuadPart) + QueryPerformanceFrequency(&iCounterFreq); QueryPerformanceCounter(&iCounter); - iCounter.QuadPart = iCounter.QuadPart * 1000 / iCounterFreq; + iCounter.QuadPart = iCounter.QuadPart * 1000 / iCounterFreq.QuadPart; return iCounter.u.LowPart; } Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Sat Mar 5 10:20:00 2016 @@ -946,6 +946,8 @@ if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl)) return E_INVALIDARG; + if(dwFlags & URL_ESCAPE_AS_UTF8) + return E_NOTIMPL; if((ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags)) == E_POINTER) { escapedW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags); @@ -980,6 +982,9 @@ return ch == ' '; if ((flags & URL_ESCAPE_PERCENT) && (ch == '%')) + return TRUE; + + if ((flags & URL_ESCAPE_AS_UTF8) && (ch >= 0x80)) return TRUE; if (ch <= 31 || (ch >= 127 && ch <= 255) ) @@ -1057,8 +1062,8 @@ LPCWSTR src; DWORD needed = 0, ret; BOOL stop_escaping = FALSE; - WCHAR next[5], *dst, *dst_ptr; - INT len; + WCHAR next[12], *dst, *dst_ptr; + INT i, len; PARSEDURLW parsed_url; DWORD int_flags; DWORD slashes = 0; @@ -1073,7 +1078,8 @@ if(dwFlags & ~(URL_ESCAPE_SPACES_ONLY | URL_ESCAPE_SEGMENT_ONLY | URL_DONT_ESCAPE_EXTRA_INFO | - URL_ESCAPE_PERCENT)) + URL_ESCAPE_PERCENT | + URL_ESCAPE_AS_UTF8)) FIXME("Unimplemented flags: %08x\n", dwFlags); dst_ptr = dst = HeapAlloc(GetProcessHeap(), 0, *pcchEscaped*sizeof(WCHAR)); @@ -1176,10 +1182,39 @@ if(cur == '\\' && (int_flags & WINE_URL_BASH_AS_SLASH) && !stop_escaping) cur = '/'; if(URL_NeedEscapeW(cur, dwFlags, int_flags) && stop_escaping == FALSE) { - next[0] = '%'; - next[1] = hexDigits[(cur >> 4) & 0xf]; - next[2] = hexDigits[cur & 0xf]; - len = 3; + if(dwFlags & URL_ESCAPE_AS_UTF8) { + char utf[16]; + + if ((cur >= 0xd800 && cur <= 0xdfff) && + (src[1] >= 0xdc00 && src[1] <= 0xdfff)) + { + len = WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, src, 2, + utf, sizeof(utf), NULL, NULL ); + src++; + } + else + len = WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, &cur, 1, + utf, sizeof(utf), NULL, NULL ); + + if (!len) { + utf[0] = 0xef; + utf[1] = 0xbf; + utf[2] = 0xbd; + len = 3; + } + + for(i = 0; i < len; i++) { + next[i*3+0] = '%'; + next[i*3+1] = hexDigits[(utf[i] >> 4) & 0xf]; + next[i*3+2] = hexDigits[utf[i] & 0xf]; + } + len *= 3; + } else { + next[0] = '%'; + next[1] = hexDigits[(cur >> 4) & 0xf]; + next[2] = hexDigits[cur & 0xf]; + len = 3; + } } else { next[0] = cur; len = 1; 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] Sat Mar 5 10:20:00 2016 @@ -177,7 +177,7 @@ reactos/dll/win32/shdocvw # Synced to WineStaging-1.7.55 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-1.7.55 -reactos/dll/win32/shlwapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/shlwapi # Synced to WineStaging-1.9.4 reactos/dll/win32/slbcsp # Synced to WineStaging-1.7.55 reactos/dll/win32/snmpapi # Synced to WineStaging-1.7.55 reactos/dll/win32/softpub # Synced to WineStaging-1.7.55

1 0

[pschweitzer] 70932: [BTRFSLIB] Stub the Btrfs lib CORE-10892
by pschweitzer＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: pschweitzer Date: Sat Mar 5 10:20:32 2016 New Revision: 70932 URL: http://svn.reactos.org/svn/reactos?rev=70932&view=rev Log: [BTRFSLIB] Stub the Btrfs lib CORE-10892 Added: trunk/reactos/lib/fslib/btrfslib/ trunk/reactos/lib/fslib/btrfslib/CMakeLists.txt (with props) trunk/reactos/lib/fslib/btrfslib/btrfslib.c (with props) trunk/reactos/lib/fslib/btrfslib/btrfslib.h (with props) Modified: trunk/reactos/lib/fslib/CMakeLists.txt Modified: trunk/reactos/lib/fslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/lib/fslib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/CMakeLists.txt [iso-8859-1] Sat Mar 5 10:20:32 2016 @@ -1,4 +1,5 @@ +add_subdirectory(btrfslib) add_subdirectory(ext2lib) add_subdirectory(ntfslib) add_subdirectory(vfatlib) Added: trunk/reactos/lib/fslib/btrfslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/btrfslib/CMakeLi… ============================================================================== --- trunk/reactos/lib/fslib/btrfslib/CMakeLists.txt (added) +++ trunk/reactos/lib/fslib/btrfslib/CMakeLists.txt [iso-8859-1] Sat Mar 5 10:20:32 2016 @@ -0,0 +1,3 @@ + +add_library(btrfslib btrfslib.c) +add_dependencies(btrfslib psdk) Propchange: trunk/reactos/lib/fslib/btrfslib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/fslib/btrfslib/btrfslib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/btrfslib/btrfsli… ============================================================================== --- trunk/reactos/lib/fslib/btrfslib/btrfslib.c (added) +++ trunk/reactos/lib/fslib/btrfslib/btrfslib.c [iso-8859-1] Sat Mar 5 10:20:32 2016 @@ -0,0 +1,36 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NTFS FS library + * FILE: lib/fslib/btrfslib/btrfslib.c + * PURPOSE: BTRFS lib + * PROGRAMMERS: Pierre Schweitzer + */ +#include "btrfslib.h" + +#define NDEBUG +#include <debug.h> + +NTSTATUS NTAPI +BtrfsFormat(IN PUNICODE_STRING DriveRoot, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PUNICODE_STRING Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + + +NTSTATUS WINAPI +BtrfsChkdsk(IN PUNICODE_STRING DriveRoot, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} Propchange: trunk/reactos/lib/fslib/btrfslib/btrfslib.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/fslib/btrfslib/btrfslib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/btrfslib/btrfsli… ============================================================================== --- trunk/reactos/lib/fslib/btrfslib/btrfslib.h (added) +++ trunk/reactos/lib/fslib/btrfslib/btrfslib.h [iso-8859-1] Sat Mar 5 10:20:32 2016 @@ -0,0 +1,8 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS BTRFS FS library + * FILE: lib/fslib/btrfslib/btrfslib.h + */ +#define NTOS_MODE_USER +#include <ndk/umtypes.h> +#include <fmifs/fmifs.h> Propchange: trunk/reactos/lib/fslib/btrfslib/btrfslib.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 70928: [RICHED32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Sat Mar 5 10:08:10 2016 New Revision: 70928 URL: http://svn.reactos.org/svn/reactos?rev=70928&view=rev Log: [RICHED32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/riched32/editor.c Modified: trunk/rostests/winetests/riched32/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched32/editor… ============================================================================== --- trunk/rostests/winetests/riched32/editor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched32/editor.c [iso-8859-1] Sat Mar 5 10:08:10 2016 @@ -29,11 +29,13 @@ #include <winuser.h> #include <winnls.h> #include <ole2.h> +#include <commdlg.h> #include <richedit.h> #include <time.h> #include <wine/test.h> static HMODULE hmoduleRichEdit; +static BOOL is_lang_japanese; static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; @@ -128,22 +130,33 @@ static void test_WM_GETTEXTLENGTH(void) { HWND hwndRichEdit = new_richedit(NULL); - static const char text3[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee"; - static const char text4[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee\r\n"; + static const char text1[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee"; + static const char text2[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee\r\n"; + static const char text3[] = "abcdef\x8e\xf0"; int result; /* Test for WM_GETTEXTLENGTH */ - SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == lstrlenA(text3), - "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", - result, lstrlenA(text3)); - - SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text4); + ok(result == lstrlenA(text1), + "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", + result, lstrlenA(text1)); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == lstrlenA(text4), - "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", - result, lstrlenA(text4)); + ok(result == lstrlenA(text2), + "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", + result, lstrlenA(text2)); + + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); + } DestroyWindow(hwndRichEdit); } @@ -497,6 +510,29 @@ offset_test[i][0], result, offset_test[i][1]); } + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + const char *text1 = + "wine\n" + "richedit\x8e\xf0\n" + "wine"; + static int offset_test1[3][3] = { + {0, 4}, /* Line 1: |wine\n */ + {5, 10, 1}, /* Line 2: |richedit\x8e\xf0\n */ + {16, 4}, /* Line 3: |wine */ + }; + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) { + result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0); + todo_wine_if (offset_test1[i][2]) + ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test1[i][0], result, offset_test1[i][1]); + } + } + DestroyWindow(hwndRichEdit); } @@ -538,6 +574,18 @@ ok(!strcmp(expect3, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + textRange.chrg.cpMin = 4; + textRange.chrg.cpMax = 8; + result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == 4, "EM_GETTEXTRANGE returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + } DestroyWindow(hwndRichEdit); } @@ -556,17 +604,27 @@ SendMessageA(hwndRichEdit, EM_SETSEL, 4, 12); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 8, "EM_GETTEXTRANGE returned %ld\n", result); - ok(!strcmp(expect1, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 8, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect1, buffer), "EM_GETSELTEXT filled %s\n", buffer); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); - - ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); - + ok(result == 7, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect2, buffer), "EM_GETSELTEXT filled %s\n", buffer); + + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); + ok(result == 4, "EM_GETSELTEXT returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETSELTEXT filled %s\n", buffer); + } DestroyWindow(hwndRichEdit); } @@ -1200,6 +1258,163 @@ DestroyWindow(hwndRichEdit); } +struct exsetsel_s { + LONG min; + LONG max; + LRESULT expected_retval; + int expected_getsel_start; + int expected_getsel_end; + BOOL result_todo; + BOOL sel_todo; +}; + +static const struct exsetsel_s exsetsel_tests[] = { + /* sanity tests */ + {5, 10, 10, 5, 10, 0, 0 }, + {15, 17, 17, 15, 17, 0, 0 }, + /* test cpMax > strlen() */ + {0, 100, 19, 0, 19, 1, 0 }, + /* test cpMin < 0 && cpMax >= 0 after cpMax > strlen() */ + {-1, 1, 17, 17, 17, 1, 0 }, + /* test cpMin == cpMax */ + {5, 5, 5, 5, 5, 0, 0 }, + /* test cpMin < 0 && cpMax >= 0 (bug 4462) */ + {-1, 0, 5, 5, 5, 0, 0 }, + {-1, 17, 5, 5, 5, 0, 0 }, + {-1, 18, 5, 5, 5, 0, 0 }, + /* test cpMin < 0 && cpMax < 0 */ + {-1, -1, 17, 17, 17, 0, 0 }, + {-4, -5, 17, 17, 17, 0, 0 }, + /* test cpMin >=0 && cpMax < 0 (bug 6814) */ + {0, -1, 19, 0, 19, 1, 0 }, + {17, -5, 19, 17, 19, 1, 0 }, + {18, -3, 19, 17, 19, 1, 1 }, + /* test if cpMin > cpMax */ + {15, 19, 19, 15, 19, 1, 0 }, + {19, 15, 19, 15, 19, 1, 0 }, + /* cpMin == strlen() && cpMax > cpMin */ + {17, 18, 17, 17, 17, 1, 1 }, + {17, 50, 19, 17, 19, 1, 0 }, +}; + +static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { + CHARRANGE cr; + LRESULT result; + int start, end; + + cr.cpMin = setsel->min; + cr.cpMax = setsel->max; + result = SendMessageA(hwnd, EM_EXSETSEL, 0, (LPARAM)&cr); + + todo_wine_if (setsel->result_todo) + ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); + + todo_wine_if (setsel->sel_todo) + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, + "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", + id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); +} + +static void test_EM_EXSETSEL(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + int i; + const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + + /* sending some text to the window */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); + /* 01234567890123456 */ + + for (i = 0; i < num_tests; i++) { + check_EM_EXSETSEL(hwndRichEdit, &exsetsel_tests[i], i); + } + + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + CHARRANGE cr; + LRESULT result; +#define MAX_BUF_LEN 1024 + char bufA[MAX_BUF_LEN] = {0}; + + /* Test with multibyte character */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + /* 012345 6 7 8901 */ + cr.cpMin = 4, cr.cpMax = 8; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); + todo_wine ok(result == 7, "EM_EXSETSEL return %ld expected 7\n", result); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); + todo_wine ok(!strcmp(bufA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); + SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(cr.cpMin == 4, "Selection start incorrectly: %d expected 4\n", cr.cpMin); + ok(cr.cpMax == 8, "Selection end incorrectly: %d expected 8\n", cr.cpMax); + } + + DestroyWindow(hwndRichEdit); +} + +static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { + LRESULT result; + int start, end; + + result = SendMessageA(hwnd, EM_SETSEL, setsel->min, setsel->max); + + todo_wine_if (setsel->result_todo) + ok(result == setsel->expected_retval, "EM_SETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); + + todo_wine_if (setsel->sel_todo) + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, + "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", + id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); +} + +static void test_EM_SETSEL(void) +{ + char buffA[32] = {0}; + HWND hwndRichEdit = new_richedit(NULL); + int i; + const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + + /* sending some text to the window */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); + /* 01234567890123456 */ + + for (i = 0; i < num_tests; i++) { + check_EM_SETSEL(hwndRichEdit, &exsetsel_tests[i], i); + } + + SendMessageA(hwndRichEdit, EM_SETSEL, 17, 18); + buffA[0] = 123; + SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffA); + ok(buffA[0] == 0, "selection text %s\n", buffA); + + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + int sel_start, sel_end; + LRESULT result; + + /* Test with multibyte character */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + /* 012345 6 7 8901 */ + result = SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + todo_wine ok(result == 7, "EM_SETSEL return %ld expected 7\n", result); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(buffA), (LPARAM)buffA); + todo_wine ok(!strcmp(buffA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); + result = SendMessageA(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == 4, "Selection start incorrectly: %d expected 4\n", sel_start); + ok(sel_end == 8, "Selection end incorrectly: %d expected 8\n", sel_end); + } + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { MSG msg; @@ -1210,6 +1425,7 @@ * RICHED32.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched32.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); test_WM_SETTEXT(); test_EM_GETTEXTRANGE(); @@ -1225,6 +1441,8 @@ test_EM_GETOPTIONS(); test_autoscroll(); test_enter(); + test_EM_EXSETSEL(); + test_EM_SETSEL(); /* Set the environment variable WINETEST_RICHED32 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

[akhaldi] 70929: [PSDK] Add missing URL_ESCAPE_AS_UTF8.
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Sat Mar 5 10:10:10 2016 New Revision: 70929 URL: http://svn.reactos.org/svn/reactos?rev=70929&view=rev Log: [PSDK] Add missing URL_ESCAPE_AS_UTF8. Modified: trunk/reactos/include/psdk/shlwapi.h Modified: trunk/reactos/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] Sat Mar 5 10:10:10 2016 @@ -1220,6 +1220,7 @@ #define URL_UNESCAPE_INPLACE 0x00100000 #define URL_FILE_USE_PATHURL 0x00010000 +#define URL_ESCAPE_AS_UTF8 0x00040000 #define URL_ESCAPE_SEGMENT_ONLY 0x00002000 #define URL_ESCAPE_PERCENT 0x00001000

1 0

[akhaldi] 70930: [SECUR32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Sat Mar 5 10:14:32 2016 New Revision: 70930 URL: http://svn.reactos.org/svn/reactos?rev=70930&view=rev Log: [SECUR32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/secur32/ntlm.c trunk/rostests/winetests/secur32/schannel.c Modified: trunk/rostests/winetests/secur32/ntlm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/ntlm.c?… ============================================================================== --- trunk/rostests/winetests/secur32/ntlm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/secur32/ntlm.c [iso-8859-1] Sat Mar 5 10:14:32 2016 @@ -928,7 +928,7 @@ static char sec_pkg_name[] = "NTLM"; SecBufferDesc crypt; SecBuffer data[2], fake_data[2], complex_data[4]; - ULONG qop = 0; + ULONG qop = 0xdeadbeef; SecPkgContext_Sizes ctxt_sizes; static char test_user[] = "testuser", workgroup[] = "WORKGROUP", @@ -1041,12 +1041,13 @@ ok(sec_status == SEC_E_MESSAGE_ALTERED, "VerifySignature returned %s, not SEC_E_MESSAGE_ALTERED.\n", getSecError(sec_status)); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); memcpy(data[0].pvBuffer, message_signature, data[0].cbBuffer); - sec_status = pVerifySignature(&client.ctxt, &crypt, 0, &qop); ok(sec_status == SEC_E_OK, "VerifySignature returned %s, not SEC_E_OK.\n", getSecError(sec_status)); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); sec_status = pEncryptMessage(&client.ctxt, 0, &crypt, 0); if (sec_status == SEC_E_UNSUPPORTED_FUNCTION) @@ -1093,6 +1094,7 @@ ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary, crypt.pBuffers[1].cbBuffer), "Failed to decrypt message correctly.\n"); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); } else trace( "A different session key is being used\n" ); @@ -1130,6 +1132,7 @@ sec_status = pVerifySignature(&client.ctxt, &crypt, 0, &qop); ok(sec_status == SEC_E_OK, "VerifySignature returned %s, not SEC_E_OK\n", getSecError(sec_status)); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); sec_status = pEncryptMessage(&client.ctxt, 0, &crypt, 0); ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", @@ -1161,6 +1164,7 @@ sec_status = pDecryptMessage(&client.ctxt, &crypt, 0, &qop); ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); end: Modified: trunk/rostests/winetests/secur32/schannel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/schanne… ============================================================================== --- trunk/rostests/winetests/secur32/schannel.c [iso-8859-1] (original) +++ trunk/rostests/winetests/secur32/schannel.c [iso-8859-1] Sat Mar 5 10:14:32 2016 @@ -927,8 +927,7 @@ status = pQueryContextAttributesA(&context, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_CONNECTION_INFO) failed: %08x\n", status); if(status == SEC_E_OK) { - ok(conn_info.dwCipherStrength == 128 || conn_info.dwCipherStrength == 168, - "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); + ok(conn_info.dwCipherStrength >= 128, "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); }

1 0

[akhaldi] 70925: [RPCRT4] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Sat Mar 5 10:04:14 2016 New Revision: 70925 URL: http://svn.reactos.org/svn/reactos?rev=70925&view=rev Log: [RPCRT4] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] Sat Mar 5 10:04:14 2016 @@ -1616,6 +1616,16 @@ } /*********************************************************************** + * RpcBindingServerFromClient (RPCRT4.@) + */ +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcBindingServerFromClient( RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE *ServerBinding ) +{ + FIXME("%p %p: stub\n", ClientBinding, ServerBinding); + return RPC_S_INVALID_BINDING; +} + +/*********************************************************************** * RpcBindingSetAuthInfoExA (RPCRT4.@) */ RPCRTAPI RPC_STATUS RPC_ENTRY Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] Sat Mar 5 10:04:14 2016 @@ -345,7 +345,7 @@ 345 stdcall RpcBindingInqObject(ptr ptr) 346 stub RpcBindingInqOption 347 stdcall RpcBindingReset(ptr) -348 stub RpcBindingServerFromClient +348 stdcall RpcBindingServerFromClient(ptr ptr) 349 stdcall RpcBindingSetAuthInfoA(ptr str long long ptr long) 350 stdcall RpcBindingSetAuthInfoExA(ptr str long long ptr long ptr) 351 stdcall RpcBindingSetAuthInfoExW(ptr wstr long long ptr long ptr) 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] Sat Mar 5 10:04:14 2016 @@ -163,7 +163,7 @@ reactos/dll/win32/resutils # Synced to WineStaging-1.7.55 reactos/dll/win32/riched20 # Synced to WineStaging-1.9.4 reactos/dll/win32/riched32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.7.55 +reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.9.4 reactos/dll/win32/rsabase # Synced to WineStaging-1.7.55 reactos/dll/win32/rsaenh # Synced to WineStaging-1.7.55 reactos/dll/win32/sccbase # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70926: [SCRRUN] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Sat Mar 5 10:06:02 2016 New Revision: 70926 URL: http://svn.reactos.org/svn/reactos?rev=70926&view=rev Log: [SCRRUN] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/scrrun/filesystem.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/filesyste… ============================================================================== --- trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] Sat Mar 5 10:06:02 2016 @@ -3208,9 +3208,27 @@ static HRESULT WINAPI filesys_DriveExists(IFileSystem3 *iface, BSTR DriveSpec, VARIANT_BOOL *pfExists) { - FIXME("%p %s %p\n", iface, debugstr_w(DriveSpec), pfExists); - - return E_NOTIMPL; + UINT len; + WCHAR driveletter; + TRACE("%p %s %p\n", iface, debugstr_w(DriveSpec), pfExists); + + if (!pfExists) return E_POINTER; + + *pfExists = VARIANT_FALSE; + len = SysStringLen(DriveSpec); + + if (len >= 1) { + driveletter = toupperW(DriveSpec[0]); + if (driveletter >= 'A' && driveletter <= 'Z' + && (len < 2 || DriveSpec[1] == ':') + && (len < 3 || DriveSpec[2] == '\\')) { + const WCHAR root[] = {driveletter, ':', '\\', 0}; + UINT drivetype = GetDriveTypeW(root); + *pfExists = drivetype != DRIVE_NO_ROOT_DIR && drivetype != DRIVE_UNKNOWN ? VARIANT_TRUE : VARIANT_FALSE; + } + } + + return S_OK; } static HRESULT WINAPI filesys_FileExists(IFileSystem3 *iface, BSTR path, VARIANT_BOOL *ret) @@ -3241,9 +3259,40 @@ static HRESULT WINAPI filesys_GetDrive(IFileSystem3 *iface, BSTR DriveSpec, IDrive **ppdrive) { - FIXME("%p %s %p\n", iface, debugstr_w(DriveSpec), ppdrive); - - return E_NOTIMPL; + UINT len; + HRESULT hr; + WCHAR driveletter; + VARIANT_BOOL drive_exists; + + TRACE("%p %s %p\n", iface, debugstr_w(DriveSpec), ppdrive); + + if (!ppdrive) + return E_POINTER; + + *ppdrive = NULL; + + /* DriveSpec may be one of: 'x', 'x:', 'x:\', '\\computer\share' */ + len = SysStringLen(DriveSpec); + if (!len) + return E_INVALIDARG; + else if (len <= 3) { + driveletter = toupperW(DriveSpec[0]); + if (driveletter < 'A' || driveletter > 'Z' + || (len >= 2 && DriveSpec[1] != ':') + || (len == 3 && DriveSpec[2] != '\\')) + return E_INVALIDARG; + hr = IFileSystem3_DriveExists(iface, DriveSpec, &drive_exists); + if (FAILED(hr)) + return hr; + if (drive_exists == VARIANT_FALSE) + return CTL_E_DEVICEUNAVAILABLE; + return create_drive(driveletter, ppdrive); + } else { + if (DriveSpec[0] != '\\' || DriveSpec[1] != '\\') + return E_INVALIDARG; + FIXME("%s not implemented yet\n", debugstr_w(DriveSpec)); + return E_NOTIMPL; + } } static HRESULT WINAPI filesys_GetFile(IFileSystem3 *iface, BSTR FilePath, 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] Sat Mar 5 10:06:02 2016 @@ -168,7 +168,7 @@ reactos/dll/win32/rsaenh # Synced to WineStaging-1.7.55 reactos/dll/win32/sccbase # Synced to WineStaging-1.7.55 reactos/dll/win32/schannel # Synced to WineStaging-1.7.55 -reactos/dll/win32/scrrun # Synced to WineStaging-1.7.55 +reactos/dll/win32/scrrun # Synced to WineStaging-1.9.4 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to WineStaging-1.7.55

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
27
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2016