Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 67901: [KERNEL32_APITEST] Add very long tests for tunnel cache. So far, they are skipped because they are really long (they require more than 15s to complete). Unfortunately, for unkn...
by pschweitzer＠svn.reactos.org 25 May '15

25 May '15

Author: pschweitzer Date: Mon May 25 11:38:02 2015 New Revision: 67901 URL: http://svn.reactos.org/svn/reactos?rev=67901&view=rev Log: [KERNEL32_APITEST] Add very long tests for tunnel cache. So far, they are skipped because they are really long (they require more than 15s to complete). Unfortunately, for unknown reason now, they are failing in ReactOS (whereas they shouldn't!). An idea would be to see whether we can set an expiry of 1s for tunnel cache just for dbgtests and query the value from registry, so that it could help reduce test duration on ReactOS (but not on w2k3). ROSTESTS-177 Modified: trunk/rostests/apitests/kernel32/TunnelCache.c Modified: trunk/rostests/apitests/kernel32/TunnelCache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/TunnelC… ============================================================================== --- trunk/rostests/apitests/kernel32/TunnelCache.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/TunnelCache.c [iso-8859-1] Mon May 25 11:38:02 2015 @@ -13,13 +13,16 @@ static void -Test_LongTests(void) +Test_VeryLongTests(void) { UCHAR i = 0; HANDLE hFile; CHAR TestDir[] = "XTestDirTunnelCache"; CHAR OldDir[MAX_PATH]; FILETIME FileTime, File1Time; + + win_skip("Too long, see: ROSTESTS-177"); + return; /* Create a blank test directory */ if (GetCurrentDirectory(MAX_PATH, OldDir) == 0) @@ -75,6 +78,10 @@ CloseHandle(hFile); ok(MoveFile("file1", "file") != FALSE, "MoveFile() failed\n"); + /* Sleep over cache expiry */ + /* FIXME: Query correct value from registry if it exists: + * \HKLM\System\CurrentControlSet\Control\FileSystem\MaximumTunnelEntryAgeInSeconds */ + Sleep(16000); ok(MoveFile("file2", "file1") != FALSE, "MoveFile() failed\n"); hFile = CreateFile("file1", @@ -87,7 +94,7 @@ ok(GetFileTime(hFile, &File1Time, NULL, NULL) != FALSE, "GetFileTime() failed\n"); CloseHandle(hFile); - ok(RtlCompareMemory(&FileTime, &File1Time, sizeof(FILETIME)) == sizeof(FILETIME), "Tunnel cache failed\n"); + ok(RtlCompareMemory(&FileTime, &File1Time, sizeof(FILETIME)) != sizeof(FILETIME), "Tunnel cache still in action?\n"); DeleteFile("file2"); DeleteFile("file1"); @@ -99,14 +106,13 @@ static void -Test_ShortTests(void) +Test_LongTests(void) { UCHAR i = 0; - CHAR ShortName[14]; - HANDLE hFile, hFind; - WIN32_FIND_DATA FileInfo; + HANDLE hFile; CHAR TestDir[] = "XTestDirTunnelCache"; CHAR OldDir[MAX_PATH]; + FILETIME FileTime, File1Time; /* Create a blank test directory */ if (GetCurrentDirectory(MAX_PATH, OldDir) == 0) @@ -138,6 +144,93 @@ return; } + hFile = CreateFile("file1", + GENERIC_READ | GENERIC_WRITE, + 0, NULL, + CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, + NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile() failed\n"); + ok(GetFileTime(hFile, &FileTime, NULL, NULL) != FALSE, "GetFileTime() failed\n"); + CloseHandle(hFile); + + /* Wait a least 10ms (resolution of FAT) */ + /* XXX: Increased to 1s for ReactOS... */ + Sleep(1000); + + hFile = CreateFile("file2", + GENERIC_READ | GENERIC_WRITE, + 0, NULL, + CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, + NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile() failed\n"); + CloseHandle(hFile); + + ok(MoveFile("file1", "file") != FALSE, "MoveFile() failed\n"); + ok(MoveFile("file2", "file1") != FALSE, "MoveFile() failed\n"); + + hFile = CreateFile("file1", + GENERIC_READ, + 0, NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile() failed\n"); + ok(GetFileTime(hFile, &File1Time, NULL, NULL) != FALSE, "GetFileTime() failed\n"); + CloseHandle(hFile); + + ok(RtlCompareMemory(&FileTime, &File1Time, sizeof(FILETIME)) == sizeof(FILETIME), "Tunnel cache failed\n"); + + DeleteFile("file2"); + DeleteFile("file1"); + DeleteFile("file"); + + SetCurrentDirectory(OldDir); + RemoveDirectory(TestDir); +} + +static +void +Test_ShortTests(void) +{ + UCHAR i = 0; + CHAR ShortName[14]; + HANDLE hFile, hFind; + WIN32_FIND_DATA FileInfo; + CHAR TestDir[] = "XTestDirTunnelCache"; + CHAR OldDir[MAX_PATH]; + + /* Create a blank test directory */ + if (GetCurrentDirectory(MAX_PATH, OldDir) == 0) + { + win_skip("No test directory available\n"); + return; + } + + /* Create a blank test directory */ + for (; i < 10; ++i) + { + TestDir[0] = '0' + i; + if (CreateDirectory(TestDir, NULL)) + { + if (SetCurrentDirectory(TestDir) == 0) + { + RemoveDirectory(TestDir); + win_skip("No test directory available\n"); + return; + } + + break; + } + } + + if (i == 10) + { + win_skip("No test directory available\n"); + return; + } + hFile = CreateFile("verylongfilename", GENERIC_READ | GENERIC_WRITE, 0, NULL, @@ -185,4 +278,5 @@ { Test_ShortTests(); Test_LongTests(); -} + Test_VeryLongTests(); +}

1 0

[pschweitzer] 67900: [KERNEL32_APITEST] Add more tests for tunnel cache
by pschweitzer＠svn.reactos.org 25 May '15

25 May '15

Author: pschweitzer Date: Mon May 25 11:14:12 2015 New Revision: 67900 URL: http://svn.reactos.org/svn/reactos?rev=67900&view=rev Log: [KERNEL32_APITEST] Add more tests for tunnel cache Modified: trunk/rostests/apitests/kernel32/TunnelCache.c Modified: trunk/rostests/apitests/kernel32/TunnelCache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/TunnelC… ============================================================================== --- trunk/rostests/apitests/kernel32/TunnelCache.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/TunnelCache.c [iso-8859-1] Mon May 25 11:14:12 2015 @@ -10,6 +10,92 @@ #define WIN32_NO_STATUS #include <stdio.h> #include <ndk/rtlfuncs.h> + +static +void +Test_LongTests(void) +{ + UCHAR i = 0; + HANDLE hFile; + CHAR TestDir[] = "XTestDirTunnelCache"; + CHAR OldDir[MAX_PATH]; + FILETIME FileTime, File1Time; + + /* Create a blank test directory */ + if (GetCurrentDirectory(MAX_PATH, OldDir) == 0) + { + win_skip("No test directory available\n"); + return; + } + + /* Create a blank test directory */ + for (; i < 10; ++i) + { + TestDir[0] = '0' + i; + if (CreateDirectory(TestDir, NULL)) + { + if (SetCurrentDirectory(TestDir) == 0) + { + RemoveDirectory(TestDir); + win_skip("No test directory available\n"); + return; + } + + break; + } + } + + if (i == 10) + { + win_skip("No test directory available\n"); + return; + } + + hFile = CreateFile("file1", + GENERIC_READ | GENERIC_WRITE, + 0, NULL, + CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, + NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile() failed\n"); + ok(GetFileTime(hFile, &FileTime, NULL, NULL) != FALSE, "GetFileTime() failed\n"); + CloseHandle(hFile); + + /* Wait a least 10ms (resolution of FAT) */ + /* XXX: Increased to 1s for ReactOS... */ + Sleep(1000); + + hFile = CreateFile("file2", + GENERIC_READ | GENERIC_WRITE, + 0, NULL, + CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, + NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile() failed\n"); + CloseHandle(hFile); + + ok(MoveFile("file1", "file") != FALSE, "MoveFile() failed\n"); + ok(MoveFile("file2", "file1") != FALSE, "MoveFile() failed\n"); + + hFile = CreateFile("file1", + GENERIC_READ, + 0, NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile() failed\n"); + ok(GetFileTime(hFile, &File1Time, NULL, NULL) != FALSE, "GetFileTime() failed\n"); + CloseHandle(hFile); + + ok(RtlCompareMemory(&FileTime, &File1Time, sizeof(FILETIME)) == sizeof(FILETIME), "Tunnel cache failed\n"); + + DeleteFile("file2"); + DeleteFile("file1"); + DeleteFile("file"); + + SetCurrentDirectory(OldDir); + RemoveDirectory(TestDir); +} static void @@ -98,4 +184,5 @@ START_TEST(TunnelCache) { Test_ShortTests(); + Test_LongTests(); }

1 0

[akhaldi] 67899: [README.WINE] Mark more modules as synced with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 25 May '15

25 May '15

Author: akhaldi Date: Mon May 25 10:56:43 2015 New Revision: 67899 URL: http://svn.reactos.org/svn/reactos?rev=67899&view=rev Log: [README.WINE] Mark more modules as synced with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/media/doc/README.WINE 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] Mon May 25 10:56:43 2015 @@ -225,25 +225,25 @@ reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.7.37 reactos/dll/win32/xmllite # Synced to WineStaging-1.7.37 -reactos/dll/cpl/inetcpl # Synced to Wine-1.7.27 +reactos/dll/cpl/inetcpl # Synced to WineStaging-1.7.37 ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/cscript # Synced to Wine-1.7.27 +reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.7.37 reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.7.37 -reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.7.27 -reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.27 +reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.7.37 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.7.37 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.7.37 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.7.37 reactos/base/applications/games/winmine # Synced to WineStaging-1.7.37 with our own resources. -reactos/base/applications/extrac32 # Synced to Wine-1.7.27 -reactos/base/applications/iexplore # Synced to Wine-1.7.27 +reactos/base/applications/extrac32 # Synced to WineStaging-1.7.37 +reactos/base/applications/iexplore # Synced to WineStaging-1.7.37 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-1.7.37 reactos/base/applications/wordpad # Synced to WineStaging-1.7.37 -reactos/base/services/rpcss # Synced to Wine-1.7.27 -reactos/base/system/expand # Synced to Wine-1.7.27 +reactos/base/services/rpcss # Synced to WineStaging-1.7.37 +reactos/base/system/expand # Synced to WineStaging-1.7.37 reactos/base/system/msiexec # Synced to WineStaging-1.7.37 reactos/modules/rosapps/winfile # Autosync @@ -256,10 +256,10 @@ reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.37 advapi32 - - reactos/dll/win32/advapi32/wine/cred.c # Synced to Wine-1.7.27 + reactos/dll/win32/advapi32/wine/cred.c # Synced to WineStaging-1.7.37 reactos/dll/win32/advapi32/wine/crypt.c # Synced to Wine-1.7.27 - reactos/dll/win32/advapi32/wine/crypt_des.c # Synced to Wine-1.7.27 - reactos/dll/win32/advapi32/wine/crypt_lmhash.c # Synced to Wine-1.7.27 + reactos/dll/win32/advapi32/wine/crypt_des.c # Synced to WineStaging-1.7.37 + reactos/dll/win32/advapi32/wine/crypt_lmhash.c # Synced to WineStaging-1.7.37 reactos/dll/win32/advapi32/wine/security.c # Out of Sync gdi32 - @@ -271,7 +271,7 @@ reactos/dll/win32/kernel32/wine/lzexpand.c # Synced in r52754 reactos/dll/win32/kernel32/wine/profile.c # Synced in r52754 reactos/dll/win32/kernel32/wine/res.c # Synced in r52754 - reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced to Wine-1.7.27 + reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced to WineStaging-1.7.37 reactos/dll/win32/kernel32/winnls/string/chartype.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/collation.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/format_msg.c # Synced to Wine-1.7.27 @@ -284,7 +284,7 @@ reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528 reactos/lib/sdk/crt/except/cppexcept.c # Synced at 20071111 reactos/lib/sdk/crt/process/_cwait.c # Synced to WineStaging-1.7.37 - reactos/lib/sdk/crt/signal/xcptinfo.c # Synced to Wine-1.7.17 + reactos/lib/sdk/crt/signal/xcptinfo.c # Synced to WineStaging-1.7.37 reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1.7.17 reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 @@ -323,13 +323,13 @@ schannel.c reactos/dll/win32/schannel/schannel_wine.c # synced to wine-1.7.17 (secur32/schannel.c) - reactos/dll/win32/schannel/schannel_gnutls.c # synced to wine-1.7.17 (secur32/schannel_gnutls.c) + reactos/dll/win32/schannel/schannel_gnutls.c # Synced to WineStaging-1.7.37 (secur32/schannel_gnutls.c) reactos/dll/win32/schannel/secur32_wine.c # partial sync to wine-1.7.17 (secur32/secur32.c) secur32 - reactos/dll/win32/secur32/sspi.c # partial sync to wine-1.7.17 (secur32.c) - reactos/dll/win32/secur32/thunks.c # synced to wine-1.7.17 - reactos/dll/win32/secur32/wrapper.c # synced to wine-1.7.17 + reactos/dll/win32/secur32/thunks.c # Synced to WineStaging-1.7.37 + reactos/dll/win32/secur32/wrapper.c # Synced to WineStaging-1.7.37 ws2_32 - reactos/dll/win32/ws2_32/misc/async.c # Synced to Wine-1.5.4

1 0

[akhaldi] 67898: [README.WINE] Mark some modules as synced with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 25 May '15

25 May '15

Author: akhaldi Date: Mon May 25 10:34:03 2015 New Revision: 67898 URL: http://svn.reactos.org/svn/reactos?rev=67898&view=rev Log: [README.WINE] Mark some modules as synced with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/media/doc/README.WINE 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] Mon May 25 10:34:03 2015 @@ -65,136 +65,136 @@ reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.37 reactos/dll/win32/cryptui # Synced to WineStaging-1.7.37 reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.37 -reactos/dll/win32/dciman32 # Synced to Wine-1.7.27 +reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.37 reactos/dll/win32/dwmapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/faultrep # Synced to Wine-1.7.27 -reactos/dll/win32/fltlib # Synced to Wine-1.7.27 +reactos/dll/win32/faultrep # Synced to WineStaging-1.7.37 +reactos/dll/win32/fltlib # Synced to WineStaging-1.7.37 reactos/dll/win32/fusion # Synced to WineStaging-1.7.37 reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.37 -reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.27 -reactos/dll/win32/hlink # Synced to Wine-1.7.27 +reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.37 +reactos/dll/win32/hlink # Synced to WineStaging-1.7.37 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.37 -reactos/dll/win32/httpapi # Synced to Wine-1.7.27 +reactos/dll/win32/httpapi # Synced to WineStaging-1.7.37 reactos/dll/win32/iccvid # Synced to WineStaging-1.7.37 reactos/dll/win32/icmp # Out of sync reactos/dll/win32/ieframe # Synced to WineStaging-1.7.37 -reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.27 +reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.37 reactos/dll/win32/imagehlp # Synced to WineStaging-1.7.37 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 -reactos/dll/win32/inetcomm # Synced to Wine-1.7.27 -reactos/dll/win32/inetmib1 # Synced to Wine-1.7.27 -reactos/dll/win32/initpki # Synced to Wine-1.7.27 -reactos/dll/win32/inseng # Synced to Wine-1.7.27 +reactos/dll/win32/inetcomm # Synced to WineStaging-1.7.37 +reactos/dll/win32/inetmib1 # Synced to WineStaging-1.7.37 +reactos/dll/win32/initpki # Synced to WineStaging-1.7.37 +reactos/dll/win32/inseng # Synced to WineStaging-1.7.37 reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to Wine-1.7.27 -reactos/dll/win32/itss # Synced to Wine-1.7.27 +reactos/dll/win32/itircl # Synced to WineStaging-1.7.37 +reactos/dll/win32/itss # Synced to WineStaging-1.7.37 reactos/dll/win32/jscript # Synced to WineStaging-1.7.37 -reactos/dll/win32/jsproxy # Synced to Wine-1.7.27 -reactos/dll/win32/loadperf # Synced to Wine-1.7.27 +reactos/dll/win32/jsproxy # Synced to WineStaging-1.7.37 +reactos/dll/win32/loadperf # Synced to WineStaging-1.7.37 reactos/dll/win32/localspl # Synced to WineStaging-1.7.37 -reactos/dll/win32/localui # Synced to Wine-1.7.27 -reactos/dll/win32/lz32 # Synced to Wine-1.7.27 -reactos/dll/win32/mapi32 # Synced to Wine-1.7.27 +reactos/dll/win32/localui # Synced to WineStaging-1.7.37 +reactos/dll/win32/lz32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mcicda # Synced to Wine-1.7.27 +reactos/dll/win32/mcicda # Synced to WineStaging-1.7.37 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mciseq # Synced to WineStaging-1.7.37 reactos/dll/win32/mciwave # Synced to WineStaging-1.7.37 -reactos/dll/win32/mgmtapi # Synced to Wine-1.7.27 +reactos/dll/win32/mgmtapi # Synced to WineStaging-1.7.37 reactos/dll/win32/mlang # Synced to WineStaging-1.7.37 reactos/dll/win32/mmdevapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/mpr # Synced to Wine-1.7.27 -reactos/dll/win32/mprapi # Synced to Wine-1.7.27 -reactos/dll/win32/msacm32 # Synced to Wine-1.7.27 -reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.27 -reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.27 -reactos/dll/win32/mscat32 # Synced to Wine-1.7.27 +reactos/dll/win32/mpr # Synced to WineStaging-1.7.37 +reactos/dll/win32/mprapi # Synced to WineStaging-1.7.37 +reactos/dll/win32/msacm32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.37 +reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.37 +reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mscms # Synced to WineStaging-1.7.37 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to Wine-1.7.27 -reactos/dll/win32/msftedit # Synced to Wine-1.7.27 -reactos/dll/win32/msg711.acm # Synced to Wine-1.7.27 -reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.27 +reactos/dll/win32/msctf # Synced to WineStaging-1.7.37 +reactos/dll/win32/msftedit # Synced to WineStaging-1.7.37 +reactos/dll/win32/msg711.acm # Synced to WineStaging-1.7.37 +reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.37 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.37 -reactos/dll/win32/mshtml.tlb # Synced to Wine-1.7.27 +reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.37 reactos/dll/win32/msi # Synced to WineStaging-1.7.37 -reactos/dll/win32/msimg32 # Synced to Wine-1.7.27 -reactos/dll/win32/msimtf # Synced to Wine-1.7.27 -reactos/dll/win32/msisip # Synced to Wine-1.7.27 -reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.27 -reactos/dll/win32/msnet32 # Synced to Wine-1.7.27 -reactos/dll/win32/mspatcha # Synced to Wine-1.7.27 +reactos/dll/win32/msimg32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/msimtf # Synced to WineStaging-1.7.37 +reactos/dll/win32/msisip # Synced to WineStaging-1.7.37 +reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.7.37 +reactos/dll/win32/msnet32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/mspatcha # Synced to WineStaging-1.7.37 reactos/dll/win32/msrle32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mssign32 # Synced to Wine-1.7.27 -reactos/dll/win32/mssip32 # Synced to Wine-1.7.27 -reactos/dll/win32/mstask # Synced to Wine-1.7.27 +reactos/dll/win32/mssign32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/mssip32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/mstask # Synced to WineStaging-1.7.37 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msvidc32 # Synced to Wine-1.7.27 -reactos/dll/win32/msxml # Synced to Wine-1.7.27 -reactos/dll/win32/msxml2 # Synced to Wine-1.7.27 +reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/msxml # Synced to WineStaging-1.7.37 +reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.37 reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msxml4 # Synced to Wine-1.7.27 -reactos/dll/win32/msxml6 # Synced to Wine-1.7.27 -reactos/dll/win32/nddeapi # Synced to Wine-1.7.27 +reactos/dll/win32/msxml4 # Synced to WineStaging-1.7.37 +reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.37 +reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.37 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 -reactos/dll/win32/npptools # Synced to Wine-1.7.27 +reactos/dll/win32/npptools # Synced to WineStaging-1.7.37 reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/ntprint # Synced to Wine-1.7.27 -reactos/dll/win32/objsel # Synced to Wine-1.7.27 +reactos/dll/win32/ntprint # Synced to WineStaging-1.7.37 +reactos/dll/win32/objsel # Synced to WineStaging-1.7.37 reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.37 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.37 reactos/dll/win32/oleacc # Synced to WineStaging-1.7.37 reactos/dll/win32/oleaut32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/olecli32 # Synced to Wine-1.7.27 -reactos/dll/win32/oledlg # Synced to Wine-1.7.27 -reactos/dll/win32/olepro32 # Synced to Wine-1.7.27 -reactos/dll/win32/olesvr32 # Synced to Wine-1.7.27 -reactos/dll/win32/olethk32 # Synced to Wine-1.7.27 -reactos/dll/win32/pdh # Synced to Wine-1.7.27 -reactos/dll/win32/pidgen # Synced to Wine-1.7.27 +reactos/dll/win32/olecli32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/oledlg # Synced to WineStaging-1.7.37 +reactos/dll/win32/olepro32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/olesvr32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/olethk32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/pdh # Synced to WineStaging-1.7.37 +reactos/dll/win32/pidgen # Synced to WineStaging-1.7.37 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to Wine-1.7.27 +reactos/dll/win32/printui # Synced to WineStaging-1.7.37 reactos/dll/win32/propsys # Synced to WineStaging-1.7.37 -reactos/dll/win32/pstorec # Synced to Wine-1.7.27 -reactos/dll/win32/qmgr # Synced to Wine-1.7.27 -reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.27 -reactos/dll/win32/query # Synced to Wine-1.7.27 -reactos/dll/win32/rasapi32 # Synced to Wine-1.7.27 -reactos/dll/win32/resutils # Synced to Wine-1.7.27 +reactos/dll/win32/pstorec # Synced to WineStaging-1.7.37 +reactos/dll/win32/qmgr # Synced to WineStaging-1.7.37 +reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.7.37 +reactos/dll/win32/query # Synced to WineStaging-1.7.37 +reactos/dll/win32/rasapi32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/resutils # Synced to WineStaging-1.7.37 reactos/dll/win32/riched20 # Synced to WineStaging-1.7.37 -reactos/dll/win32/riched32 # Synced to Wine-1.7.27 +reactos/dll/win32/riched32 # Synced to WineStaging-1.7.37 reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.17 -reactos/dll/win32/rsabase # Synced to Wine-1.7.27 +reactos/dll/win32/rsabase # Synced to WineStaging-1.7.37 reactos/dll/win32/rsaenh # Synced to WineStaging-1.7.37 -reactos/dll/win32/sccbase # Synced to Wine-1.7.27 -reactos/dll/win32/schannel # Synced to Wine-1.7.27 +reactos/dll/win32/sccbase # Synced to WineStaging-1.7.37 +reactos/dll/win32/schannel # Synced to WineStaging-1.7.37 reactos/dll/win32/scrrun # Synced to WineStaging-1.7.37 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to Wine-1.7.27 +reactos/dll/win32/sensapi # Synced to WineStaging-1.7.37 reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to Wine-1.7.27 +reactos/dll/win32/shdoclc # Synced to WineStaging-1.7.37 reactos/dll/win32/shdocvw # Synced to WineStaging-1.7.37 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Synced to Wine-1.7.27 +reactos/dll/win32/shfolder # Synced to WineStaging-1.7.37 reactos/dll/win32/shlwapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/slbcsp # Synced to Wine-1.7.27 -reactos/dll/win32/snmpapi # Synced to Wine-1.7.27 -reactos/dll/win32/softpub # Synced to Wine-1.7.27 -reactos/dll/win32/spoolss # Synced to Wine-1.7.27 -reactos/dll/win32/stdole2.tlb # Synced to Wine-1.7.27 -reactos/dll/win32/stdole32.tlb # Synced to Wine-1.7.27 -reactos/dll/win32/sti # Synced to Wine-1.7.27 -reactos/dll/win32/sxs # Synced to Wine-1.7.27 -reactos/dll/win32/tapi32 # Synced to Wine-1.7.27 -reactos/dll/win32/traffic # Synced to Wine-1.7.27 -reactos/dll/win32/twain_32 # Synced to Wine-1.7.27 +reactos/dll/win32/slbcsp # Synced to WineStaging-1.7.37 +reactos/dll/win32/snmpapi # Synced to WineStaging-1.7.37 +reactos/dll/win32/softpub # Synced to WineStaging-1.7.37 +reactos/dll/win32/spoolss # Synced to WineStaging-1.7.37 +reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.7.37 +reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.7.37 +reactos/dll/win32/sti # Synced to WineStaging-1.7.37 +reactos/dll/win32/sxs # Synced to WineStaging-1.7.37 +reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/traffic # Synced to WineStaging-1.7.37 +reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.37 reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) -reactos/dll/win32/updspapi # Synced to Wine-1.7.27 -reactos/dll/win32/url # Synced to Wine-1.7.27 +reactos/dll/win32/updspapi # Synced to WineStaging-1.7.37 +reactos/dll/win32/url # Synced to WineStaging-1.7.37 reactos/dll/win32/urlmon # Synced to WineStaging-1.7.37 reactos/dll/win32/usp10 # Synced to WineStaging-1.7.37 reactos/dll/win32/uxtheme # Forked @@ -203,26 +203,26 @@ reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.37 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.37 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.7.37 -reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.27 -reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.27 +reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.37 +reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.37 reactos/dll/win32/wing32 # Out of sync reactos/dll/win32/winhttp # Synced to WineStaging-1.7.37 reactos/dll/win32/wininet # Synced to WineStaging-1.7.37 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 -reactos/dll/win32/winscard # Synced to Wine-1.7.27 +reactos/dll/win32/winscard # Synced to WineStaging-1.7.37 reactos/dll/win32/wintrust # Synced to WineStaging-1.7.37 -reactos/dll/win32/wldap32 # Synced to Wine-1.7.27 -reactos/dll/win32/wmi # Synced to Wine-1.7.27 -reactos/dll/win32/wmiutils # Synced to Wine-1.7.27 +reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/wmi # Synced to WineStaging-1.7.37 +reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.37 reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.37 reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/wuapi # Synced to Wine-1.7.27 -reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.27 -reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.27 -reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.27 -reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.27 +reactos/dll/win32/wuapi # Synced to WineStaging-1.7.37 +reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.7.37 +reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.7.37 +reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.7.37 +reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.7.37 reactos/dll/win32/xmllite # Synced to WineStaging-1.7.37 reactos/dll/cpl/inetcpl # Synced to Wine-1.7.27

1 0

[pschweitzer] 67897: [KERNEL32_APITEST] Add simple tests regarding renaming and tunnel cache behavior for short names in user mode. Longer tests should be added to show what happens in case of cach...
by pschweitzer＠svn.reactos.org 25 May '15

25 May '15

Author: pschweitzer Date: Mon May 25 10:30:12 2015 New Revision: 67897 URL: http://svn.reactos.org/svn/reactos?rev=67897&view=rev Log: [KERNEL32_APITEST] Add simple tests regarding renaming and tunnel cache behavior for short names in user mode. Longer tests should be added to show what happens in case of cache expiry. All pass on w2k3 but not on ReactOS. CORE-3875 Added: trunk/rostests/apitests/kernel32/TunnelCache.c (with props) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Mon May 25 10:30:12 2015 @@ -12,6 +12,7 @@ SetCurrentDirectory.c SetUnhandledExceptionFilter.c TerminateProcess.c + TunnelCache.c testlist.c) add_executable(kernel32_apitest ${SOURCE}) Added: trunk/rostests/apitests/kernel32/TunnelCache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/TunnelC… ============================================================================== --- trunk/rostests/apitests/kernel32/TunnelCache.c (added) +++ trunk/rostests/apitests/kernel32/TunnelCache.c [iso-8859-1] Mon May 25 10:30:12 2015 @@ -0,0 +1,101 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for Tunnel Cache + * PROGRAMMER: Pierre Schweitzer <pierre.schweitzer(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <ndk/rtlfuncs.h> + +static +void +Test_ShortTests(void) +{ + UCHAR i = 0; + CHAR ShortName[14]; + HANDLE hFile, hFind; + WIN32_FIND_DATA FileInfo; + CHAR TestDir[] = "XTestDirTunnelCache"; + CHAR OldDir[MAX_PATH]; + + /* Create a blank test directory */ + if (GetCurrentDirectory(MAX_PATH, OldDir) == 0) + { + win_skip("No test directory available\n"); + return; + } + + /* Create a blank test directory */ + for (; i < 10; ++i) + { + TestDir[0] = '0' + i; + if (CreateDirectory(TestDir, NULL)) + { + if (SetCurrentDirectory(TestDir) == 0) + { + RemoveDirectory(TestDir); + win_skip("No test directory available\n"); + return; + } + + break; + } + } + + if (i == 10) + { + win_skip("No test directory available\n"); + return; + } + + hFile = CreateFile("verylongfilename", + GENERIC_READ | GENERIC_WRITE, + 0, NULL, + CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, + NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile() failed\n"); + CloseHandle(hFile); + + hFind = FindFirstFile("verylongfilename", &FileInfo); + ok(hFind != INVALID_HANDLE_VALUE, "FindFirstFile() failed\n"); + FindClose(hFind); + RtlCopyMemory(ShortName, FileInfo.cAlternateFileName, sizeof(ShortName)); + + ok(MoveFile("verylongfilename", "verylongfilename2") != FALSE, "MoveFile() failed\n"); + hFind = FindFirstFile("verylongfilename2", &FileInfo); + ok(hFind != INVALID_HANDLE_VALUE, "FindFirstFile() failed\n"); + FindClose(hFind); + ok(strcmp(FileInfo.cAlternateFileName, ShortName) == 0, "strcmp() failed\n"); + + hFile = CreateFile("randomfilename", + GENERIC_READ | GENERIC_WRITE, + 0, NULL, + CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, + NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile() failed\n"); + CloseHandle(hFile); + + ok(MoveFileEx("randomfilename", "verylongfilename2", MOVEFILE_REPLACE_EXISTING) != FALSE, "MoveFile() failed\n"); + hFind = FindFirstFile("verylongfilename2", &FileInfo); + ok(hFind != INVALID_HANDLE_VALUE, "FindFirstFile() failed\n"); + FindClose(hFind); + ok(strcmp(FileInfo.cAlternateFileName, ShortName) == 0, "strcmp() failed\n"); + + DeleteFile("randomfilename"); + DeleteFile("verylongfilename"); + DeleteFile("verylongfilename2"); + + SetCurrentDirectory(OldDir); + RemoveDirectory(TestDir); +} + +START_TEST(TunnelCache) +{ + Test_ShortTests(); +} Propchange: trunk/rostests/apitests/kernel32/TunnelCache.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Mon May 25 10:30:12 2015 @@ -15,6 +15,7 @@ extern void func_SetCurrentDirectory(void); extern void func_SetUnhandledExceptionFilter(void); extern void func_TerminateProcess(void); +extern void func_TunnelCache(void); const struct test winetest_testlist[] = { @@ -30,6 +31,7 @@ { "SetCurrentDirectory", func_SetCurrentDirectory }, { "SetUnhandledExceptionFilter", func_SetUnhandledExceptionFilter }, { "TerminateProcess", func_TerminateProcess }, + { "TunnelCache", func_TunnelCache }, { 0, 0 } };

1 0

[akhaldi] 67896: [CRYPTUI] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 25 May '15

25 May '15

Author: akhaldi Date: Mon May 25 09:39:49 2015 New Revision: 67896 URL: http://svn.reactos.org/svn/reactos?rev=67896&view=rev Log: [CRYPTUI] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/cryptui/cryptui.spec trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc trunk/reactos/dll/win32/cryptui/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptui/cryptui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.spec [iso-8859-1] Mon May 25 09:39:49 2015 @@ -3,7 +3,7 @@ 3 stub CryptUIDlgFreeCAContext 4 stub CryptUIDlgSelectCA 5 stdcall CryptUIDlgSelectCertificateA(ptr) -6 stub CryptUIDlgSelectCertificateFromStore +6 stdcall CryptUIDlgSelectCertificateFromStore(ptr ptr wstr wstr long long ptr) 7 stdcall CryptUIDlgSelectCertificateW(ptr) 8 stdcall CryptUIDlgSelectStoreA(ptr) 9 stdcall CryptUIDlgSelectStoreW(ptr) @@ -30,7 +30,7 @@ 30 stub CryptUIWizBuildCTL 31 stub CryptUIWizCertRequest 32 stub CryptUIWizCreateCertRequestNoDS -33 stub CryptUIWizDigitalSign +33 stdcall CryptUIWizDigitalSign(long long wstr ptr ptr) 34 stdcall CryptUIWizExport(long ptr wstr ptr ptr) 35 stub CryptUIWizFreeCertRequestNoDS 36 stub CryptUIWizFreeDigitalSignContext Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc [iso-8859-1] Mon May 25 09:39:49 2015 @@ -107,7 +107,7 @@ IDS_WARN_REMOVE_MY "You will no longer be able to decrypt messages with this certificate, or sign messages with it.\nAre you sure you want to remove this certificate?" IDS_WARN_REMOVE_PLURAL_MY "You will no longer be able to decrypt messages with these certificates, or sign messages with them.\nAre you sure you want to remove these certificates?" IDS_WARN_REMOVE_ADDRESSBOOK "You will no longer be able to encrypt messages with this certificate, or verify messages signed with it.\nAre you sure you want to remove this certificate?" - IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "You will no longer be able to encrypt messages with these certificates, or verify messages signed with it.\nAre you sure you want to remove these certificates?" + IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "You will no longer be able to encrypt messages with these certificates, or verify messages signed with them.\nAre you sure you want to remove these certificates?" IDS_WARN_REMOVE_CA "Certificates issued by this certification authority will no longer be trusted.\nAre you sure you want to remove this certificate?" IDS_WARN_REMOVE_PLURAL_CA "Certificates issued by these certification authorities will no longer be trusted.\nAre you sure you want to remove these certificates?" IDS_WARN_REMOVE_ROOT "Certificates issued by this root certification authority, or any certification authorities it issued, will no longer be trusted.\nAre you sure you want to remove this trusted root certificate?" Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Mon May 25 09:39:49 2015 @@ -20,7 +20,7 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <config.h> +#include <wine/config.h> #include <stdarg.h> @@ -7053,3 +7053,18 @@ FIXME("%p: stub\n", pcsc); return NULL; } + +PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore, HWND hwnd, LPCWSTR pwszTitle, + LPCWSTR pwszDisplayString, DWORD dwDontUseColumn, + DWORD dwFlags, void *pvReserved) +{ + FIXME("%p %p %s %s %d %d %p: stub\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved); + return NULL; +} + +BOOL WINAPI CryptUIWizDigitalSign(DWORD flags, HWND parent, LPCWSTR title, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO info, + PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *context) +{ + FIXME("%d %p %s %p %p: stub\n", flags, parent, debugstr_w(title), info, context); + 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] Mon May 25 09:39:49 2015 @@ -63,7 +63,7 @@ reactos/dll/win32/cryptdlg # Synced to WineStaging-1.7.37 reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.37 reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.37 -reactos/dll/win32/cryptui # Synced to Wine-1.7.27 +reactos/dll/win32/cryptui # Synced to WineStaging-1.7.37 reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.37 reactos/dll/win32/dciman32 # Synced to Wine-1.7.27 reactos/dll/win32/dwmapi # Synced to WineStaging-1.7.37

1 0

[akhaldi] 67895: [PSDK] Update cryptuiapi.h. CORE-9246
by akhaldi＠svn.reactos.org 25 May '15

25 May '15

Author: akhaldi Date: Mon May 25 09:39:00 2015 New Revision: 67895 URL: http://svn.reactos.org/svn/reactos?rev=67895&view=rev Log: [PSDK] Update cryptuiapi.h. CORE-9246 Modified: trunk/reactos/include/psdk/cryptuiapi.h Modified: trunk/reactos/include/psdk/cryptuiapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cryptuiapi.h?… ============================================================================== --- trunk/reactos/include/psdk/cryptuiapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/cryptuiapi.h [iso-8859-1] Mon May 25 09:39:00 2015 @@ -240,6 +240,7 @@ DWORD cbBlob; BYTE *pbBlob; } CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT, *PCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT; +typedef const CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT; /* Values for CryptUIWizDigitalSign's dwFlags */ #define CRYPTUI_WIZ_NO_UI 0x00000001 @@ -248,7 +249,7 @@ BOOL WINAPI CryptUIWizDigitalSign(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO pDigitalSignInfo, - PCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *ppSignContext); + PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *ppSignContext); BOOL WINAPI CryptUIWizFreeDigitalSignContext( PCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT pSignContext);

1 0

[aandrejevic] 67894: [FAST486] Fix the implementation of FSIN and FCOS: First of all, 4 steps for a Maclaurin series is not enough. Second, the angle should be normalized to the [-pi/2, pi/2] range.
by aandrejevic＠svn.reactos.org 25 May '15

25 May '15

Author: aandrejevic Date: Mon May 25 03:23:40 2015 New Revision: 67894 URL: http://svn.reactos.org/svn/reactos?rev=67894&view=rev Log: [FAST486] Fix the implementation of FSIN and FCOS: First of all, 4 steps for a Maclaurin series is not enough. Second, the angle should be normalized to the [-pi/2, pi/2] range. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6789… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Mon May 25 03:23:40 2015 @@ -55,6 +55,9 @@ /* 2.00 */ static const FAST486_FPU_DATA_REG FpuTwo = {0x8000000000000000ULL, FPU_REAL10_BIAS + 1, FALSE}; + +/* Pi / 2 */ +static const FAST486_FPU_DATA_REG FpuHalfPi = {0xC90FDAA22168C235ULL, FPU_REAL10_BIAS, FALSE}; static const FAST486_FPU_DATA_REG FpuInverseNumber[INVERSE_NUMBERS_COUNT] = { @@ -110,6 +113,114 @@ {0xA3D70A3D70A3D70AULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 50 */ }; +static const FAST486_FPU_DATA_REG FpuInverseNumberSine[INVERSE_NUMBERS_COUNT] = +{ + {0xAAAAAAAAAAAAAAAAULL, FPU_REAL10_BIAS - 3, FALSE}, /* 1 / 6 */ + {0xCCCCCCCCCCCCCCCCULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 20 */ + {0xC30C30C30C30C30CULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 42 */ + {0xE38E38E38E38E38EULL, FPU_REAL10_BIAS - 7, FALSE}, /* 1 / 72 */ + {0x94F2094F2094F209ULL, FPU_REAL10_BIAS - 7, FALSE}, /* 1 / 110 */ + {0xD20D20D20D20D20DULL, FPU_REAL10_BIAS - 8, FALSE}, /* 1 / 156 */ + {0x9C09C09C09C09C09ULL, FPU_REAL10_BIAS - 8, FALSE}, /* 1 / 210 */ + {0xF0F0F0F0F0F0F0F0ULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 272 */ + {0xBFA02FE80BFA02FEULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 342 */ + {0x9C09C09C09C09C09ULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 420 */ + {0x81848DA8FAF0D277ULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 506 */ + {0xDA740DA740DA740DULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 600 */ + {0xBAB656100BAB6561ULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 702 */ + {0xA16B312EA8FC377CULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 812 */ + {0x8CF008CF008CF008ULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 930 */ + {0xF83E0F83E0F83E0FULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1056 */ + {0xDC4A00DC4A00DC4AULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1190 */ + {0xC4CE07B00C4CE07BULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1332 */ + {0xB0E2A2600B0E2A26ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1482 */ + {0x9FD809FD809FD809ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1640 */ + {0x9126D6E4802449B5ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1806 */ + {0x84655D9BAB2F1008ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1980 */ + {0xF2805AF0221A0CC9ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2162 */ + {0xDEE95C4CA037BA57ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2352 */ + {0xCD9A673400CD9A67ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2550 */ + {0xBE3C310B84A4F832ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2756 */ + {0xB087277A39941560ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2970 */ + {0xA44029100A440291ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3192 */ + {0x9936034AA9121AA1ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3422 */ + {0x8F3F82A86DACA008ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3660 */ + {0x8639F00218E7C008ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3906 */ + {0xFC0FC0FC0FC0FC0FULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4160 */ + {0xED208916CF412FD1ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4422 */ + {0xDF7B4EC93886702DULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4692 */ + {0xD2FB287C7224E167ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4970 */ + {0xC78031E00C78031EULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 5256 */ + {0xBCEEBFB33F021F2EULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 5550 */ + {0xB32EB86E96D5D441ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 5852 */ + {0xAA2B0A62E08248F3ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6162 */ + {0xA1D139855F7268EDULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6480 */ + {0x9A1100604AA03C2EULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6806 */ + {0x92DC0092DC0092DCULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 7140 */ + {0x8C258008C258008CULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 7482 */ + {0x85E230A32BAB46DDULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 7832 */ + {0x8008008008008008ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 8190 */ + {0xF51BE2CC2D7AAC94ULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 8556 */ + {0xEAD7EC46DDA80C62ULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 8930 */ + {0xE135A9C97500E135ULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 9312 */ + {0xD8281B71177BDB7BULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 9702 */ + {0xCFA3892CE9FFCC17ULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 10100 */ +}; + +static const FAST486_FPU_DATA_REG FpuInverseNumberCosine[INVERSE_NUMBERS_COUNT] = +{ + {0x8000000000000000ULL, FPU_REAL10_BIAS - 1, FALSE}, /* 1 / 2 */ + {0xAAAAAAAAAAAAAAAAULL, FPU_REAL10_BIAS - 4, FALSE}, /* 1 / 12 */ + {0x8888888888888888ULL, FPU_REAL10_BIAS - 5, FALSE}, /* 1 / 30 */ + {0x9249249249249249ULL, FPU_REAL10_BIAS - 6, FALSE}, /* 1 / 56 */ + {0xB60B60B60B60B60BULL, FPU_REAL10_BIAS - 7, FALSE}, /* 1 / 90 */ + {0xF83E0F83E0F83E0FULL, FPU_REAL10_BIAS - 8, FALSE}, /* 1 / 132 */ + {0xB40B40B40B40B40BULL, FPU_REAL10_BIAS - 8, FALSE}, /* 1 / 182 */ + {0x8888888888888888ULL, FPU_REAL10_BIAS - 8, FALSE}, /* 1 / 240 */ + {0xD62B80D62B80D62BULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 306 */ + {0xAC7691840AC76918ULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 380 */ + {0x8DDA520237694808ULL, FPU_REAL10_BIAS - 9, FALSE}, /* 1 / 462 */ + {0xED7303B5CC0ED730ULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 552 */ + {0xC9A633FCD967300CULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 650 */ + {0xAD602B580AD602B5ULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 756 */ + {0x96A850096A850096ULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 870 */ + {0x8421084210842108ULL, FPU_REAL10_BIAS - 10, FALSE}, /* 1 / 992 */ + {0xE9A3D25E00E9A3D2ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1122 */ + {0xD00D00D00D00D00DULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1260 */ + {0xBA7258200BA72582ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1406 */ + {0xA80A80A80A80A80AULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1560 */ + {0x983B773A92E16009ULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1722 */ + {0x8A8DCD1FEEAE465CULL, FPU_REAL10_BIAS - 11, FALSE}, /* 1 / 1892 */ + {0xFD477B6C956529CDULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2070 */ + {0xE865AC7B7603A196ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2256 */ + {0xD5FEBF01E17D2DC4ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2450 */ + {0xC5B200C5B200C5B2ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2652 */ + {0xB7307B1492B1D28FULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 2862 */ + {0xAA392F35DC17F00AULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3080 */ + {0x9E96394D47B46C68ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3306 */ + {0x941A9CC82BF7E68BULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3540 */ + {0x8AA08EF5936D4008ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 3782 */ + {0x8208208208208208ULL, FPU_REAL10_BIAS - 12, FALSE}, /* 1 / 4032 */ + {0xF46C5E0BB22F800FULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4290 */ + {0xE6271BA5329217D3ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4556 */ + {0xD918B2EF5B7B4866ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 4830 */ + {0xCD1ED923A7DCBEB2ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 5112 */ + {0xC21BDD800C21BDD8ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 5402 */ + {0xB7F5F08CD84C2BD5ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 5700 */ + {0xAE968C517F46800AULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6006 */ + {0xA5E9F6ED347F0721ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6320 */ + {0x9DDEDA75A1CD4726ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6642 */ + {0x9665EE14DB2283E4ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 6972 */ + {0x8F71AD362448008FULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 7310 */ + {0x88F61A371B048C2BULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 7656 */ + {0x82E88A942AB2D933ULL, FPU_REAL10_BIAS - 13, FALSE}, /* 1 / 8010 */ + {0xFA7EF5D91AC9538AULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 8372 */ + {0xEFE4D31416B96CFEULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 8742 */ + {0xE5F36CB00E5F36CBULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 9120 */ + {0xDC9D0ECFCB6E9378ULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 9506 */ + {0xD3D56292AB7E800DULL, FPU_REAL10_BIAS - 14, FALSE}, /* 1 / 9900 */ +}; + /* PRIVATE FUNCTIONS **********************************************************/ #ifndef FAST486_NO_FPU @@ -1202,7 +1313,8 @@ PCFAST486_FPU_DATA_REG FirstOperand, PCFAST486_FPU_DATA_REG SecondOperand, BOOLEAN RoundToNearest, - PFAST486_FPU_DATA_REG Result) + PFAST486_FPU_DATA_REG Result, + PLONGLONG Quotient OPTIONAL) { BOOLEAN Success = FALSE; INT OldRoundingMode = State->FpuControl.Rc; @@ -1219,6 +1331,7 @@ if (!Fast486FpuMultiply(State, &Temp, SecondOperand, &Temp)) goto Cleanup; if (!Fast486FpuSubtract(State, FirstOperand, &Temp, Result)) goto Cleanup; + if (Quotient) *Quotient = Integer; Success = TRUE; Cleanup: @@ -1236,14 +1349,43 @@ PFAST486_FPU_DATA_REG Result) { INT i; - FAST486_FPU_DATA_REG TempResult = *Operand; - FAST486_FPU_DATA_REG OperandSquared = *Operand; - FAST486_FPU_DATA_REG SeriesElement = *Operand; + ULONGLONG Quadrant; + FAST486_FPU_DATA_REG Normalized = *Operand; + FAST486_FPU_DATA_REG TempResult; + FAST486_FPU_DATA_REG OperandSquared; + FAST486_FPU_DATA_REG SeriesElement; + PCFAST486_FPU_DATA_REG Inverse; + + if (!Fast486FpuRemainder(State, + Operand, + &FpuHalfPi, + FALSE, + &Normalized, + (PLONGLONG)&Quadrant)) + { + return FALSE; + } + + /* Normalize the quadrant number */ + Quadrant &= 3; + + if (!(Quadrant & 1)) + { + /* This is a sine */ + Inverse = FpuInverseNumberSine; + TempResult = SeriesElement = Normalized; + } + else + { + /* This is a cosine */ + Inverse = FpuInverseNumberCosine; + TempResult = SeriesElement = FpuOne; + } /* Calculate the square of the operand */ - if (!Fast486FpuMultiply(State, Operand, Operand, &OperandSquared)) return FALSE; - - for (i = 2; (i * (i + 1)) <= INVERSE_NUMBERS_COUNT; i += 2) + if (!Fast486FpuMultiply(State, &Normalized, &Normalized, &OperandSquared)) return FALSE; + + for (i = 0; i < INVERSE_NUMBERS_COUNT; i++) { if (!Fast486FpuMultiply(State, &SeriesElement, &OperandSquared, &SeriesElement)) { @@ -1253,7 +1395,7 @@ if (!Fast486FpuMultiply(State, &SeriesElement, - &FpuInverseNumber[i * (i + 1) - 1], + &Inverse[i], &SeriesElement)) { /* An exception occurred */ @@ -1269,6 +1411,9 @@ return FALSE; } } + + /* Flip the sign for the third and fourth quadrant */ + if (Quadrant >= 2) TempResult.Sign = !TempResult.Sign; *Result = TempResult; return TRUE; @@ -1283,43 +1428,13 @@ PFAST486_FPU_DATA_REG Operand, PFAST486_FPU_DATA_REG Result) { - INT i; - FAST486_FPU_DATA_REG TempResult = FpuOne; - FAST486_FPU_DATA_REG OperandSquared = *Operand; - FAST486_FPU_DATA_REG SeriesElement = FpuOne; - - /* Calculate the square of the operand */ - if (!Fast486FpuMultiply(State, Operand, Operand, &OperandSquared)) return FALSE; - - for (i = 1; (i * (i + 1)) <= INVERSE_NUMBERS_COUNT; i += 2) - { - if (!Fast486FpuMultiply(State, &SeriesElement, &OperandSquared, &SeriesElement)) - { - /* An exception occurred */ - return FALSE; - } - - if (!Fast486FpuMultiply(State, - &SeriesElement, - &FpuInverseNumber[i * (i + 1) - 1], - &SeriesElement)) - { - /* An exception occurred */ - return FALSE; - } - - /* Toggle the sign of the series element */ - SeriesElement.Sign = !SeriesElement.Sign; - - if (!Fast486FpuAdd(State, &TempResult, &SeriesElement, &TempResult)) - { - /* An exception occurred */ - return FALSE; - } - } - - *Result = TempResult; - return TRUE; + FAST486_FPU_DATA_REG Value = *Operand; + + /* Add pi / 2 */ + if (!Fast486FpuAdd(State, &Value, &FpuHalfPi, &Value)) return FALSE; + + /* Calculate the sine */ + return Fast486FpuCalculateSine(State, &Value, Result); } static inline VOID FASTCALL @@ -2090,7 +2205,7 @@ break; } - Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), TRUE, &FPU_ST(0)); + Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), TRUE, &FPU_ST(0), NULL); FPU_UPDATE_TAG(0); break; @@ -2121,7 +2236,7 @@ break; } - Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), FALSE, &FPU_ST(0)); + Fast486FpuRemainder(State, &FPU_ST(0), &FPU_ST(1), FALSE, &FPU_ST(0), NULL); FPU_UPDATE_TAG(0); break;

1 0

[ekohl] 67893: [SYSDM] Show a warning if the user tries to copy or rename a hardware profile to a name that is already in use.
by ekohl＠svn.reactos.org 24 May '15

24 May '15

Author: ekohl Date: Sun May 24 22:51:12 2015 New Revision: 67893 URL: http://svn.reactos.org/svn/reactos?rev=67893&view=rev Log: [SYSDM] Show a warning if the user tries to copy or rename a hardware profile to a name that is already in use. Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc trunk/reactos/dll/cpl/sysdm/resource.h Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Sun May 24 22:51:12 2015 @@ -34,16 +34,39 @@ { WCHAR szSourceName[PROFILE_NAME_LENGTH]; WCHAR szDestinationName[PROFILE_NAME_LENGTH]; + PPROFILEDATA pProfileData; } PROFILENAMES, *PPROFILENAMES; + + +static +BOOL +IsProfileNameInUse( + PPROFILENAMES pProfileNames, + BOOL bIgnoreCurrent) +{ + DWORD i; + + for (i = 0; i < pProfileNames->pProfileData->dwProfileCount; i++) + { + if (bIgnoreCurrent == TRUE && i == pProfileNames->pProfileData->dwSelectedProfileIndex) + continue; + + if (wcscmp(pProfileNames->pProfileData->pProfiles[i].szFriendlyName, pProfileNames->szDestinationName) == 0) + return TRUE; + } + + return FALSE; +} static INT_PTR CALLBACK -CopyProfileDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +CopyProfileDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { PPROFILENAMES pProfileNames; @@ -71,7 +94,14 @@ IDC_COPYPROFILETO, pProfileNames->szDestinationName, PROFILE_NAME_LENGTH); - EndDialog(hwndDlg, IDOK); + if (IsProfileNameInUse(pProfileNames, FALSE)) + ResourceMessageBox(hApplet, + NULL, + MB_OK | MB_ICONERROR, + IDS_HWPROFILE_WARNING, + IDS_HWPROFILE_ALREADY_IN_USE); + else + EndDialog(hwndDlg, IDOK); return TRUE; case IDCANCEL: @@ -101,6 +131,8 @@ wcscpy(ProfileNames.szSourceName, pProfile->szFriendlyName); swprintf(ProfileNames.szDestinationName, L"%s %lu", szBuffer, pProfileData->dwProfileCount); + + ProfileNames.pProfileData = pProfileData; if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_COPYPROFILE), @@ -145,10 +177,11 @@ static INT_PTR CALLBACK -RenameProfileDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +RenameProfileDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { PPROFILENAMES pProfileNames; @@ -176,7 +209,14 @@ IDC_RENPROFEDITTO, pProfileNames->szDestinationName, PROFILE_NAME_LENGTH); - EndDialog(hwndDlg, IDOK); + if (IsProfileNameInUse(pProfileNames, TRUE)) + ResourceMessageBox(hApplet, + NULL, + MB_OK | MB_ICONERROR, + IDS_HWPROFILE_WARNING, + IDS_HWPROFILE_ALREADY_IN_USE); + else + EndDialog(hwndDlg, IDOK); return TRUE; case IDCANCEL: @@ -206,6 +246,8 @@ wcscpy(ProfileNames.szSourceName, pProfile->szFriendlyName); swprintf(ProfileNames.szDestinationName, L"%s %lu", szBuffer, pProfileData->dwProfileCount); + + ProfileNames.pProfileData = pProfileData; if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_RENAMEPROFILE), @@ -248,36 +290,36 @@ if (MessageBox(NULL, szMessage, szCaption, - MB_YESNO | MB_ICONQUESTION) == IDYES) - { - SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_DELETESTRING, pProfileData->dwSelectedProfileIndex, 0); - - if (pProfileData->dwSelectedProfileIndex != pProfileData->dwProfileCount - 1) - { - RtlMoveMemory(&pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex], - &pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex + 1], - (pProfileData->dwProfileCount - pProfileData->dwSelectedProfileIndex - 1) * sizeof(PPROFILE)); - } - else - { - pProfileData->dwSelectedProfileIndex--; - } - - pProfiles = HeapReAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - pProfileData->pProfiles, - (pProfileData->dwProfileCount - 1) * sizeof(PROFILE)); - if (pProfiles == NULL) - { - DPRINT1("HeapReAlloc() failed!\n"); - return; - } - - pProfileData->dwProfileCount--; - pProfileData->pProfiles = pProfiles; - - SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_SETCURSEL, pProfileData->dwSelectedProfileIndex, 0); - } + MB_YESNO | MB_ICONQUESTION) != IDYES) + return; + + SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_DELETESTRING, pProfileData->dwSelectedProfileIndex, 0); + + if (pProfileData->dwSelectedProfileIndex != pProfileData->dwProfileCount - 1) + { + RtlMoveMemory(&pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex], + &pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex + 1], + (pProfileData->dwProfileCount - pProfileData->dwSelectedProfileIndex - 1) * sizeof(PPROFILE)); + } + else + { + pProfileData->dwSelectedProfileIndex--; + } + + pProfiles = HeapReAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + pProfileData->pProfiles, + (pProfileData->dwProfileCount - 1) * sizeof(PROFILE)); + if (pProfiles == NULL) + { + DPRINT1("HeapReAlloc() failed!\n"); + return; + } + + pProfileData->dwProfileCount--; + pProfileData->pProfiles = pProfiles; + + SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_SETCURSEL, pProfileData->dwSelectedProfileIndex, 0); } Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -288,4 +288,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/da-DK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -292,4 +292,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -285,4 +285,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/he-IL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -285,4 +285,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/hu-HU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -285,4 +285,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -292,4 +292,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -292,4 +292,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -291,4 +291,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sq-AL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -283,4 +283,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -285,4 +285,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/tr-TR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -285,4 +285,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -291,4 +291,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Sun May 24 22:51:12 2015 @@ -285,4 +285,5 @@ IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" -END + IDS_HWPROFILE_WARNING "Warning" +END Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Sun May 24 22:51:12 2015 @@ -47,6 +47,7 @@ #define IDS_HWPROFILE_CONFIRM_DELETE 86 #define IDS_HWPROFILE_ALREADY_IN_USE 87 #define IDS_HWPROFILE_PROFILE 88 +#define IDS_HWPROFILE_WARNING 89 /* Propsheet - general */ #define IDD_PROPPAGEGENERAL 100

1 0

[pschweitzer] 67892: [NTFS] Handle IRP_MJ_CLOSE with the dispatch routine
by pschweitzer＠svn.reactos.org 24 May '15

24 May '15

Author: pschweitzer Date: Sun May 24 21:29:34 2015 New Revision: 67892 URL: http://svn.reactos.org/svn/reactos?rev=67892&view=rev Log: [NTFS] Handle IRP_MJ_CLOSE with the dispatch routine Modified: trunk/reactos/drivers/filesystems/ntfs/close.c trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] Sun May 24 21:29:34 2015 @@ -79,35 +79,30 @@ } -NTSTATUS NTAPI -NtfsFsdClose(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NTSTATUS +NtfsClose(PNTFS_IRP_CONTEXT IrpContext) { PDEVICE_EXTENSION DeviceExtension; - PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; DPRINT("NtfsClose() called\n"); + DeviceObject = IrpContext->DeviceObject; if (DeviceObject == NtfsGlobalData->DeviceObject) { DPRINT("Closing file system\n"); - Status = STATUS_SUCCESS; - goto ByeBye; + IrpContext->Irp->IoStatus.Information = 0; + return STATUS_SUCCESS; } - Stack = IoGetCurrentIrpStackLocation(Irp); - FileObject = Stack->FileObject; + FileObject = IrpContext->FileObject; DeviceExtension = DeviceObject->DeviceExtension; - Status = NtfsCloseFile(DeviceExtension,FileObject); + Status = NtfsCloseFile(DeviceExtension, FileObject); -ByeBye: - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IrpContext->Irp->IoStatus.Information = 0; return Status; } Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Sun May 24 21:29:34 2015 @@ -96,6 +96,10 @@ case IRP_MJ_WRITE: Status = NtfsWrite(IrpContext); break; + + case IRP_MJ_CLOSE: + Status = NtfsClose(IrpContext); + break; } ASSERT((!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Sun May 24 21:29:34 2015 @@ -124,7 +124,7 @@ NtfsInitializeFunctionPointers(PDRIVER_OBJECT DriverObject) { DriverObject->MajorFunction[IRP_MJ_CREATE] = NtfsFsdCreate; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsFsdClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_READ] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = NtfsFsdDispatch; Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun May 24 21:29:34 2015 @@ -521,10 +521,8 @@ NtfsCloseFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject); -DRIVER_DISPATCH NtfsFsdClose; -NTSTATUS NTAPI -NtfsFsdClose(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +NTSTATUS +NtfsClose(PNTFS_IRP_CONTEXT IrpContext); /* create.c */

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