Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60379: [SHFOLDER] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:49:51 2013 New Revision: 60379 URL: http://svn.reactos.org/svn/reactos?rev=60379&view=rev Log: [SHFOLDER] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/shfolder/version.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shfolder/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shfolder/version… ============================================================================== --- trunk/reactos/dll/win32/shfolder/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shfolder/version.rc [iso-8859-1] Thu Sep 26 16:49:51 2013 @@ -14,12 +14,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine Shell Folder Service" #define WINE_FILENAME_STR "shfolder.dll" #define WINE_FILEVERSION 6,00,2800,1106 #define WINE_FILEVERSION_STR "6,00,2800,1106" #define WINE_PRODUCTVERSION 6,00,2800,1106 #define WINE_PRODUCTVERSION_STR "6,00,2800,1106" +#define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include <wine/wine_common_ver.rc> 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] Thu Sep 26 16:49:51 2013 @@ -176,7 +176,7 @@ reactos/dll/win32/shdoclc # Synced to Wine-1.5.19 reactos/dll/win32/shdocvw # Synced to Wine-1.7.1 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Autosync +reactos/dll/win32/shfolder # Synced to Wine-1.7.1 reactos/dll/win32/shlwapi # Synced to Wine-1.5.26 reactos/dll/win32/slbcsp # Synced to Wine-1.5.19 reactos/dll/win32/snmpapi # Synced to Wine-1.5.19

1 0

[akhaldi] 60378: [SHDOCVW_WINETEST] * Speedup build.
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:48:45 2013 New Revision: 60378 URL: http://svn.reactos.org/svn/reactos?rev=60378&view=rev Log: [SHDOCVW_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/shdocvw/CMakeLists.txt Modified: trunk/rostests/winetests/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shdocvw/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:48:45 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE shdocvw.c @@ -7,11 +5,7 @@ testlist.c) add_executable(shdocvw_winetest ${SOURCE}) -target_link_libraries(shdocvw_winetest wine uuid) +target_link_libraries(shdocvw_winetest uuid) set_module_type(shdocvw_winetest win32cui) -add_importlibs(shdocvw_winetest gdi32 shell32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(shdocvw_winetest shell32 ole32 advapi32 msvcrt kernel32) add_cd_file(TARGET shdocvw_winetest DESTINATION reactos/bin FOR all) - -if(NOT MSVC) - allow_warnings(shdocvw_winetest) -endif()

1 0

[akhaldi] 60377: [SHDOCVW] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:48:23 2013 New Revision: 60377 URL: http://svn.reactos.org/svn/reactos?rev=60377&view=rev Log: [SHDOCVW] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/shdocvw_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:48:23 2013 @@ -2,8 +2,8 @@ add_definitions( -D__WINESRC__ -D_SHDOCVW_) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -17,11 +17,9 @@ add_library(shdocvw SHARED ${SOURCE} shdocvw.rc) set_module_type(shdocvw win32dll) target_link_libraries(shdocvw uuid wine) +add_delay_importlibs(shdocvw ole32 oleaut32 ieframe) add_importlibs(shdocvw shlwapi advapi32 msvcrt kernel32 ntdll) -add_delay_importlibs(shdocvw version ole32 oleaut32 ieframe) - # shdocvw_v1.tlb needs stdole2.tlb add_dependencies(shdocvw stdole2) - add_pch(shdocvw shdocvw.h) add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] Thu Sep 26 16:48:23 2013 @@ -149,9 +149,9 @@ case DLL_PROCESS_ATTACH: break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32); - if(ieframe_instance) - FreeLibrary(ieframe_instance); + if (ieframe_instance) FreeLibrary(ieframe_instance); break; } return TRUE; @@ -442,7 +442,7 @@ } len = sizeof(buffer) / sizeof(buffer[0]); - res = ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); + ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); HeapFree(GetProcessHeap(), 0, urlW); needed = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL); 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] Thu Sep 26 16:48:23 2013 @@ -174,7 +174,7 @@ reactos/dll/win32/sensapi # Synced to Wine-1.7.1 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to Wine-1.5.19 -reactos/dll/win32/shdocvw # Synced to Wine-1.5.26 +reactos/dll/win32/shdocvw # Synced to Wine-1.7.1 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Synced to Wine-1.5.26

1 0

[akhaldi] 60376: [SENSAPI] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:46:39 2013 New Revision: 60376 URL: http://svn.reactos.org/svn/reactos?rev=60376&view=rev Log: [SENSAPI] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/sensapi/CMakeLists.txt trunk/reactos/dll/win32/sensapi/sensapi.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/sensapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sensapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:46:39 2013 @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(sensapi.dll sensapi.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -9,9 +8,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def) add_library(sensapi SHARED ${SOURCE}) - set_module_type(sensapi win32dll) target_link_libraries(sensapi wine) add_importlibs(sensapi msvcrt kernel32 ntdll) - add_cd_file(TARGET sensapi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/sensapi/sensapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sensapi/sensapi.… ============================================================================== --- trunk/reactos/dll/win32/sensapi/sensapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sensapi/sensapi.c [iso-8859-1] Thu Sep 26 16:46:39 2013 @@ -46,28 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sensapi); -static HMODULE SENSAPI_hModule; - -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - { - DisableThreadLibraryCalls(hinstDLL); - SENSAPI_hModule = hinstDLL; - break; - } - case DLL_PROCESS_DETACH: - { - break; - } - } - - return TRUE; -} - BOOL WINAPI IsDestinationReachableA(LPCSTR lpszDestination, LPQOCINFO lpQOCInfo) { FIXME("%s,%p\n", lpszDestination, lpQOCInfo); 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] Thu Sep 26 16:46:39 2013 @@ -171,7 +171,7 @@ reactos/dll/win32/scrrun # Synced to Wine-1.7.1 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to Wine-1.5.4 +reactos/dll/win32/sensapi # Synced to Wine-1.7.1 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to Wine-1.5.19 reactos/dll/win32/shdocvw # Synced to Wine-1.5.26

1 0

[akhaldi] 60375: [SCCBASE] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:42:48 2013 New Revision: 60375 URL: http://svn.reactos.org/svn/reactos?rev=60375&view=rev Log: [SCCBASE] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/sccbase/CMakeLists.txt trunk/reactos/dll/win32/sccbase/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/sccbase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sccbase/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/sccbase/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sccbase/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:42:48 2013 @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(sccbase.dll sccbase.spec) list(APPEND SOURCE @@ -10,11 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/sccbase.def) add_library(sccbase SHARED ${SOURCE}) - set_module_type(sccbase win32dll) - target_link_libraries(sccbase wine) - add_importlibs(sccbase msvcrt kernel32 ntdll) - add_cd_file(TARGET sccbase DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/sccbase/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sccbase/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/sccbase/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sccbase/main.c [iso-8859-1] Thu Sep 26 16:42:48 2013 @@ -39,10 +39,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; - case DLL_PROCESS_DETACH: - break; - default: - break; } return TRUE; } 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] Thu Sep 26 16:42:48 2013 @@ -166,7 +166,7 @@ reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26 reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Synced to Wine-1.7.1 -reactos/dll/win32/sccbase # Synced to Wine-1.5.19 +reactos/dll/win32/sccbase # Synced to Wine-1.7.1 reactos/dll/win32/schannel # Synced to Wine-1.5.19 reactos/dll/win32/scrrun # Synced to Wine-1.7.1 reactos/dll/win32/secur32 # Forked

1 0

[akhaldi] 60374: [RSAENH_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:41:54 2013 New Revision: 60374 URL: http://svn.reactos.org/svn/reactos?rev=60374&view=rev Log: [RSAENH_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/rsaenh/CMakeLists.txt trunk/rostests/winetests/rsaenh/rsaenh.c trunk/rostests/winetests/rsaenh/testlist.c Modified: trunk/rostests/winetests/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rsaenh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rsaenh/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:41:54 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(rsaenh_winetest rsaenh.c testlist.c) -target_link_libraries(rsaenh_winetest wine) set_module_type(rsaenh_winetest win32cui) -add_importlibs(rsaenh_winetest advapi32 msvcrt kernel32 ntdll) +add_importlibs(rsaenh_winetest advapi32 msvcrt kernel32) add_cd_file(TARGET rsaenh_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c… ============================================================================== --- trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] Thu Sep 26 16:41:54 2013 @@ -773,7 +773,7 @@ HCRYPTKEY hKey; BOOL result; DWORD dwLen; - unsigned char pbData[16]; + unsigned char pbData[16], enc_data[16], bad_data[16]; int i; result = derive_key(CALG_3DES_112, &hKey, 0); @@ -800,7 +800,43 @@ result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); - + memcpy(enc_data, pbData, cTestData[i].buflen); + + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); + ok(result, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); + ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); + if((dwLen != cTestData[i].enclen) || + memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)) + { + printBytes("expected",cTestData[i].decstr,cTestData[i].strlen); + printBytes("got",pbData,dwLen); + } + + /* Test bad data: + Decrypting a block of bad data with Final = TRUE should restore the + initial state of the key as well as decrypting a block of good data. + */ + + /* Changing key state by setting Final = FALSE */ + dwLen = cTestData[i].buflen; + memcpy(pbData, enc_data, cTestData[i].buflen); + result = CryptDecrypt(hKey, 0, FALSE, 0, pbData, &dwLen); + ok(result, "%08x\n", GetLastError()); + + /* Restoring key state by decrypting bad_data with Final = TRUE */ + memcpy(bad_data, enc_data, cTestData[i].buflen); + bad_data[cTestData[i].buflen - 1] = ~bad_data[cTestData[i].buflen - 1]; + SetLastError(0xdeadbeef); + result = CryptDecrypt(hKey, 0, TRUE, 0, bad_data, &dwLen); + ok(!result, "CryptDecrypt should failed!\n"); + ok(GetLastError() == NTE_BAD_DATA, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); + ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); + + /* Checking key state */ + dwLen = cTestData[i].buflen; + memcpy(pbData, enc_data, cTestData[i].buflen); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); @@ -821,7 +857,7 @@ HCRYPTKEY hKey; BOOL result; DWORD dwLen, dwMode; - unsigned char pbData[16]; + unsigned char pbData[16], enc_data[16], bad_data[16]; int i; result = derive_key(CALG_DES, &hKey, 56); @@ -856,6 +892,7 @@ result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); + memcpy(enc_data, pbData, cTestData[i].buflen); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); @@ -867,6 +904,41 @@ printBytes("expected",cTestData[i].decstr,cTestData[i].strlen); printBytes("got",pbData,dwLen); } + + /* Test bad data: + Decrypting a block of bad data with Final = TRUE should restore the + initial state of the key as well as decrypting a block of good data. + */ + + /* Changing key state by setting Final = FALSE */ + dwLen = cTestData[i].buflen; + memcpy(pbData, enc_data, cTestData[i].buflen); + result = CryptDecrypt(hKey, 0, FALSE, 0, pbData, &dwLen); + ok(result, "%08x\n", GetLastError()); + + /* Restoring key state by decrypting bad_data with Final = TRUE */ + memcpy(bad_data, enc_data, cTestData[i].buflen); + bad_data[cTestData[i].buflen - 1] = ~bad_data[cTestData[i].buflen - 1]; + SetLastError(0xdeadbeef); + result = CryptDecrypt(hKey, 0, TRUE, 0, bad_data, &dwLen); + ok(!result, "CryptDecrypt should failed!\n"); + ok(GetLastError() == NTE_BAD_DATA, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); + ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); + + /* Checking key state */ + dwLen = cTestData[i].buflen; + memcpy(pbData, enc_data, cTestData[i].buflen); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); + ok(result, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); + ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); + if((dwLen != cTestData[i].enclen) || + memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)) + { + printBytes("expected",cTestData[i].decstr,cTestData[i].strlen); + printBytes("got",pbData,dwLen); + } } result = CryptDestroyKey(hKey); @@ -878,7 +950,7 @@ HCRYPTKEY hKey; BOOL result; DWORD dwLen; - unsigned char pbData[16]; + unsigned char pbData[16], enc_data[16], bad_data[16]; static const BYTE des3[16] = { 0x7b, 0xba, 0xdd, 0xa2, 0x39, 0xd3, 0x7b, 0xb3, 0xc7, 0x51, 0x81, 0x41, 0x53, 0xe8, 0xcf, 0xeb }; @@ -906,6 +978,7 @@ result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); + memcpy(enc_data, pbData, cTestData[i].buflen); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); @@ -917,6 +990,41 @@ printBytes("expected",cTestData[i].decstr,cTestData[i].strlen); printBytes("got",pbData,dwLen); } + + /* Test bad data: + Decrypting a block of bad data with Final = TRUE should restore the + initial state of the key as well as decrypting a block of good data. + */ + + /* Changing key state by setting Final = FALSE */ + dwLen = cTestData[i].buflen; + memcpy(pbData, enc_data, cTestData[i].buflen); + result = CryptDecrypt(hKey, 0, FALSE, 0, pbData, &dwLen); + ok(result, "%08x\n", GetLastError()); + + /* Restoring key state by decrypting bad_data with Final = TRUE */ + memcpy(bad_data, enc_data, cTestData[i].buflen); + bad_data[cTestData[i].buflen - 1] = ~bad_data[cTestData[i].buflen - 1]; + SetLastError(0xdeadbeef); + result = CryptDecrypt(hKey, 0, TRUE, 0, bad_data, &dwLen); + ok(!result, "CryptDecrypt should failed!\n"); + ok(GetLastError() == NTE_BAD_DATA, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); + ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); + + /* Checking key state */ + dwLen = cTestData[i].buflen; + memcpy(pbData, enc_data, cTestData[i].buflen); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); + ok(result, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); + ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); + if((dwLen != cTestData[i].enclen) || + memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)) + { + printBytes("expected",cTestData[i].decstr,cTestData[i].strlen); + printBytes("got",pbData,dwLen); + } } result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); @@ -927,7 +1035,7 @@ HCRYPTKEY hKey; BOOL result; DWORD dwLen; - unsigned char pbData[16]; + unsigned char pbData[16], enc_data[16], bad_data[16]; int i; switch (keylen) @@ -969,7 +1077,43 @@ result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); - + memcpy(enc_data, pbData, cTestData[i].buflen); + + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); + ok(result, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); + ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); + if((dwLen != cTestData[i].enclen) || + memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)) + { + printBytes("expected",cTestData[i].decstr,cTestData[i].strlen); + printBytes("got",pbData,dwLen); + } + + /* Test bad data: + Decrypting a block of bad data with Final = TRUE should restore the + initial state of the key as well as decrypting a block of good data. + */ + + /* Changing key state by setting Final = FALSE */ + dwLen = cTestData[i].buflen; + memcpy(pbData, enc_data, cTestData[i].buflen); + result = CryptDecrypt(hKey, 0, FALSE, 0, pbData, &dwLen); + ok(result, "%08x\n", GetLastError()); + + /* Restoring key state by decrypting bad_data with Final = TRUE */ + memcpy(bad_data, enc_data, cTestData[i].buflen); + bad_data[cTestData[i].buflen - 1] = ~bad_data[cTestData[i].buflen - 1]; + SetLastError(0xdeadbeef); + result = CryptDecrypt(hKey, 0, TRUE, 0, bad_data, &dwLen); + ok(!result, "CryptDecrypt should failed!\n"); + ok(GetLastError() == NTE_BAD_DATA, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); + ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); + + /* Checking key state */ + dwLen = cTestData[i].buflen; + memcpy(pbData, enc_data, cTestData[i].buflen); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); Modified: trunk/rostests/winetests/rsaenh/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/testlist… ============================================================================== --- trunk/rostests/winetests/rsaenh/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rsaenh/testlist.c [iso-8859-1] Thu Sep 26 16:41:54 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_rsaenh(void);

1 0

[akhaldi] 60373: [RSAENH] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:41:19 2013 New Revision: 60373 URL: http://svn.reactos.org/svn/reactos?rev=60373&view=rev Log: [RSAENH] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt trunk/reactos/dll/win32/rsaenh/mpi.c trunk/reactos/dll/win32/rsaenh/rsaenh.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:41:19 2013 @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(rsaenh.dll rsaenh.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -16,12 +15,11 @@ rsa.c rsaenh.c sha2.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def) -add_library(rsaenh SHARED ${SOURCE}) +add_library(rsaenh SHARED ${SOURCE} rsrc.rc) set_module_type(rsaenh win32dll) -target_link_libraries(rsaenh uuid wine) +target_link_libraries(rsaenh wine) add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll) add_pch(rsaenh tomcrypt.h) add_cd_file(TARGET rsaenh DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/rsaenh/mpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/mpi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/mpi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/mpi.c [iso-8859-1] Thu Sep 26 16:41:19 2013 @@ -3519,8 +3519,8 @@ return res; } - a->dp[0] |= *b++; - a->used += 1; + a->dp[0] |= *b++; + a->used += 1; } mp_clamp (a); return MP_OKAY; Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.c?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] Thu Sep 26 16:41:19 2013 @@ -362,7 +362,7 @@ * * Initializes and destroys the handle table for the CSP's handles. */ -int WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved) +BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID reserved) { switch (fdwReason) { @@ -373,10 +373,11 @@ break; case DLL_PROCESS_DETACH: + if (reserved) break; destroy_handle_table(&handle_table); break; } - return 1; + return TRUE; } /****************************************************************************** @@ -1701,6 +1702,11 @@ { DWORD i; + if (dwDataLen < 3) + { + SetLastError(NTE_BAD_DATA); + return FALSE; + } for (i=2; i<dwDataLen; i++) if (!abData[i]) break; @@ -2378,11 +2384,13 @@ *pdwDataLen -= pbData[*pdwDataLen-1]; else { SetLastError(NTE_BAD_DATA); + setup_key(pCryptKey); return FALSE; } } else { SetLastError(NTE_BAD_DATA); + setup_key(pCryptKey); return FALSE; } } 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] Thu Sep 26 16:41:19 2013 @@ -165,7 +165,7 @@ reactos/dll/win32/riched32 # Synced to Wine-1.7.1 reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26 reactos/dll/win32/rsabase # Autosync -reactos/dll/win32/rsaenh # Synced to Wine-1.5.4 +reactos/dll/win32/rsaenh # Synced to Wine-1.7.1 reactos/dll/win32/sccbase # Synced to Wine-1.5.19 reactos/dll/win32/schannel # Synced to Wine-1.5.19 reactos/dll/win32/scrrun # Synced to Wine-1.7.1

1 0

[akhaldi] 60372: [RICHED32_WINETEST] * Speedup build.
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:34:10 2013 New Revision: 60372 URL: http://svn.reactos.org/svn/reactos?rev=60372&view=rev Log: [RICHED32_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/riched32/CMakeLists.txt trunk/rostests/winetests/riched32/testlist.c Modified: trunk/rostests/winetests/riched32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched32/CMakeL… ============================================================================== --- trunk/rostests/winetests/riched32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/riched32/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:34:10 2013 @@ -1,8 +1,5 @@ - -add_definitions(-D__ROS_LONG64__) add_executable(riched32_winetest editor.c testlist.c) -target_link_libraries(riched32_winetest wine) set_module_type(riched32_winetest win32cui) -add_importlibs(riched32_winetest ole32 user32 msvcrt kernel32 ntdll) +add_importlibs(riched32_winetest ole32 user32 msvcrt kernel32) add_cd_file(TARGET riched32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/riched32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched32/testli… ============================================================================== --- trunk/rostests/winetests/riched32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched32/testlist.c [iso-8859-1] Thu Sep 26 16:34:10 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_editor(void);

1 0

[akhaldi] 60371: [RICHED32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:33:17 2013 New Revision: 60371 URL: http://svn.reactos.org/svn/reactos?rev=60371&view=rev Log: [RICHED32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/riched32/CMakeLists.txt trunk/reactos/dll/win32/riched32/richedit.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/riched32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/riched32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched32/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:33:17 2013 @@ -1,16 +1,13 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(riched32.dll riched32.spec) list(APPEND SOURCE richedit.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/riched32.def) -add_library(riched32 SHARED ${SOURCE}) - +add_library(riched32 SHARED ${SOURCE} version.rc) set_module_type(riched32 win32dll) target_link_libraries(riched32 wine) add_importlibs(riched32 riched20 user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/riched32/richedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched32/richedi… ============================================================================== --- trunk/reactos/dll/win32/riched32/richedit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched32/richedit.c [iso-8859-1] Thu Sep 26 16:33:17 2013 @@ -44,16 +44,6 @@ extern LRESULT WINAPI RichEdit10ANSIWndProc(HWND, UINT, WPARAM, LPARAM); -/* Unregisters the window class. */ -static BOOL RICHED32_Unregister(void) -{ - TRACE("\n"); - - UnregisterClassA(RICHEDIT_CLASS10A, NULL); - return TRUE; -} - - /* Registers the window class. */ static BOOL RICHED32_Register(void) { @@ -84,7 +74,9 @@ return RICHED32_Register(); case DLL_PROCESS_DETACH: - return RICHED32_Unregister(); + if (lpvReserved) break; + UnregisterClassA(RICHEDIT_CLASS10A, NULL); + break; } return TRUE; } 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] Thu Sep 26 16:33:17 2013 @@ -162,7 +162,7 @@ reactos/dll/win32/rasapi32 # Synced to Wine-1.5.4 reactos/dll/win32/resutils # Synced to Wine-1.5.19 reactos/dll/win32/riched20 # Synced to Wine-1.7.1 -reactos/dll/win32/riched32 # Synced to Wine-1.5.19 +reactos/dll/win32/riched32 # Synced to Wine-1.7.1 reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26 reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Synced to Wine-1.5.4

1 0

[akhaldi] 60370: [RICHED20_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:32:32 2013 New Revision: 60370 URL: http://svn.reactos.org/svn/reactos?rev=60370&view=rev Log: [RICHED20_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/riched20/CMakeLists.txt trunk/rostests/winetests/riched20/editor.c trunk/rostests/winetests/riched20/testlist.c Modified: trunk/rostests/winetests/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/CMakeL… ============================================================================== --- trunk/rostests/winetests/riched20/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:32:32 2013 @@ -1,7 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) list(APPEND SOURCE editor.c @@ -10,7 +6,6 @@ txtsrv.c) add_executable(riched20_winetest ${SOURCE}) -target_link_libraries(riched20_winetest wine uuid) set_module_type(riched20_winetest win32cui) -add_importlibs(riched20_winetest ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll) +add_importlibs(riched20_winetest ole32 oleaut32 user32 gdi32 msvcrt kernel32) add_cd_file(TARGET riched20_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/editor… ============================================================================== --- trunk/rostests/winetests/riched20/editor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/editor.c [iso-8859-1] Thu Sep 26 16:32:32 2013 @@ -217,68 +217,128 @@ {0, -1, "wineWine wine", 0, -1}, }; -static void check_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *f, int id) { +static WCHAR *atowstr(const char *str) +{ + WCHAR *ret; + DWORD len; + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +static void check_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *f, int id, BOOL unicode) +{ int findloc; - FINDTEXT ft; - memset(&ft, 0, sizeof(ft)); - ft.chrg.cpMin = f->start; - ft.chrg.cpMax = f->end; - ft.lpstrText = f->needle; - findloc = SendMessage(hwnd, EM_FINDTEXT, f->flags, (LPARAM) &ft); - ok(findloc == f->expected_loc, - "EM_FINDTEXT(%s,%d) '%s' in range(%d,%d), flags %08x, got start at %d, expected %d\n", - name, id, f->needle, f->start, f->end, f->flags, findloc, f->expected_loc); + + if(unicode){ + FINDTEXTW ftw; + memset(&ftw, 0, sizeof(ftw)); + ftw.chrg.cpMin = f->start; + ftw.chrg.cpMax = f->end; + ftw.lpstrText = atowstr(f->needle); + + findloc = SendMessage(hwnd, EM_FINDTEXT, f->flags, (LPARAM) &ftw); + ok(findloc == f->expected_loc, + "EM_FINDTEXT(%s,%d,%u) '%s' in range(%d,%d), flags %08x, got start at %d, expected %d\n", + name, id, unicode, f->needle, f->start, f->end, f->flags, findloc, f->expected_loc); + + findloc = SendMessage(hwnd, EM_FINDTEXTW, f->flags, (LPARAM) &ftw); + ok(findloc == f->expected_loc, + "EM_FINDTEXTW(%s,%d,%u) '%s' in range(%d,%d), flags %08x, got start at %d, expected %d\n", + name, id, unicode, f->needle, f->start, f->end, f->flags, findloc, f->expected_loc); + + HeapFree(GetProcessHeap(), 0, (void*)ftw.lpstrText); + }else{ + FINDTEXTA fta; + memset(&fta, 0, sizeof(fta)); + fta.chrg.cpMin = f->start; + fta.chrg.cpMax = f->end; + fta.lpstrText = f->needle; + + findloc = SendMessage(hwnd, EM_FINDTEXT, f->flags, (LPARAM) &fta); + ok(findloc == f->expected_loc, + "EM_FINDTEXT(%s,%d,%u) '%s' in range(%d,%d), flags %08x, got start at %d, expected %d\n", + name, id, unicode, f->needle, f->start, f->end, f->flags, findloc, f->expected_loc); + } } static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f, - int id) { + int id, BOOL unicode) +{ int findloc; - FINDTEXTEX ft; int expected_end_loc; - memset(&ft, 0, sizeof(ft)); - ft.chrg.cpMin = f->start; - ft.chrg.cpMax = f->end; - ft.lpstrText = f->needle; - findloc = SendMessage(hwnd, EM_FINDTEXTEX, f->flags, (LPARAM) &ft); - ok(findloc == f->expected_loc, - "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", - name, id, f->needle, f->start, f->end, f->flags, findloc); - ok(ft.chrgText.cpMin == f->expected_loc, - "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", - name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMin); - expected_end_loc = ((f->expected_loc == -1) ? -1 - : f->expected_loc + strlen(f->needle)); - ok(ft.chrgText.cpMax == expected_end_loc, - "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d, expected %d\n", - name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMax, expected_end_loc); + if(unicode){ + FINDTEXTEXW ftw; + memset(&ftw, 0, sizeof(ftw)); + ftw.chrg.cpMin = f->start; + ftw.chrg.cpMax = f->end; + ftw.lpstrText = atowstr(f->needle); + findloc = SendMessage(hwnd, EM_FINDTEXTEX, f->flags, (LPARAM) &ftw); + ok(findloc == f->expected_loc, + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", + name, id, f->needle, f->start, f->end, f->flags, findloc); + ok(ftw.chrgText.cpMin == f->expected_loc, + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", + name, id, f->needle, f->start, f->end, f->flags, ftw.chrgText.cpMin); + expected_end_loc = ((f->expected_loc == -1) ? -1 + : f->expected_loc + strlen(f->needle)); + ok(ftw.chrgText.cpMax == expected_end_loc, + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d, expected %d\n", + name, id, f->needle, f->start, f->end, f->flags, ftw.chrgText.cpMax, expected_end_loc); + HeapFree(GetProcessHeap(), 0, (void*)ftw.lpstrText); + }else{ + FINDTEXTEXA fta; + memset(&fta, 0, sizeof(fta)); + fta.chrg.cpMin = f->start; + fta.chrg.cpMax = f->end; + fta.lpstrText = f->needle; + findloc = SendMessage(hwnd, EM_FINDTEXTEX, f->flags, (LPARAM) &fta); + ok(findloc == f->expected_loc, + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", + name, id, f->needle, f->start, f->end, f->flags, findloc); + ok(fta.chrgText.cpMin == f->expected_loc, + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", + name, id, f->needle, f->start, f->end, f->flags, fta.chrgText.cpMin); + expected_end_loc = ((f->expected_loc == -1) ? -1 + : f->expected_loc + strlen(f->needle)); + ok(fta.chrgText.cpMax == expected_end_loc, + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d, expected %d\n", + name, id, f->needle, f->start, f->end, f->flags, fta.chrgText.cpMax, expected_end_loc); + } } static void run_tests_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *find, - int num_tests) + int num_tests, BOOL unicode) { int i; for (i = 0; i < num_tests; i++) { - check_EM_FINDTEXT(hwnd, name, &find[i], i); - check_EM_FINDTEXTEX(hwnd, name, &find[i], i); + check_EM_FINDTEXT(hwnd, name, &find[i], i, unicode); + check_EM_FINDTEXTEX(hwnd, name, &find[i], i, unicode); } } -static void test_EM_FINDTEXT(void) -{ - HWND hwndRichEdit = new_richedit(NULL); +static void test_EM_FINDTEXT(BOOL unicode) +{ + HWND hwndRichEdit; CHARFORMAT2 cf2; + + if(unicode) + hwndRichEdit = new_richeditW(NULL); + else + hwndRichEdit = new_richedit(NULL); /* Empty rich edit control */ run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests, - sizeof(find_tests)/sizeof(struct find_s)); + sizeof(find_tests)/sizeof(struct find_s), unicode); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) haystack); /* Haystack text */ run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, - sizeof(find_tests2)/sizeof(struct find_s)); + sizeof(find_tests2)/sizeof(struct find_s), unicode); /* Setting a format on an arbitrary range should have no effect in search results. This tests correct offset reporting across runs. */ @@ -291,7 +351,7 @@ /* Haystack text, again */ run_tests_EM_FINDTEXT(hwndRichEdit, "2-bis", find_tests2, - sizeof(find_tests2)/sizeof(struct find_s)); + sizeof(find_tests2)/sizeof(struct find_s), unicode); /* Yet another range */ cf2.dwMask = CFM_BOLD | cf2.dwMask; @@ -301,7 +361,7 @@ /* Haystack text, again */ run_tests_EM_FINDTEXT(hwndRichEdit, "2-bisbis", find_tests2, - sizeof(find_tests2)/sizeof(struct find_s)); + sizeof(find_tests2)/sizeof(struct find_s), unicode); DestroyWindow(hwndRichEdit); } @@ -7303,7 +7363,8 @@ ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); test_WM_CHAR(); - test_EM_FINDTEXT(); + test_EM_FINDTEXT(FALSE); + test_EM_FINDTEXT(TRUE); test_EM_GETLINE(); test_EM_POSFROMCHAR(); test_EM_SCROLLCARET(); Modified: trunk/rostests/winetests/riched20/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/testli… ============================================================================== --- trunk/rostests/winetests/riched20/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/testlist.c [iso-8859-1] Thu Sep 26 16:32:32 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_editor(void); extern void func_richole(void);

1 0

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