Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 73213: [SHELL32_APITEST] -Test the IPersistFolder3 interface of CFSFolder.
by gadamopoulos＠svn.reactos.org 12 Nov '16

12 Nov '16

Author: gadamopoulos Date: Sat Nov 12 15:38:33 2016 New Revision: 73213 URL: http://svn.reactos.org/svn/reactos?rev=73213&view=rev Log: [SHELL32_APITEST] -Test the IPersistFolder3 interface of CFSFolder. Modified: trunk/rostests/apitests/shell32/CFSFolder.cpp Modified: trunk/rostests/apitests/shell32/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CFSFolde… ============================================================================== --- trunk/rostests/apitests/shell32/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CFSFolder.cpp [iso-8859-1] Sat Nov 12 15:38:33 2016 @@ -13,6 +13,16 @@ #define NDEBUG #include <debug.h> #include <shellutils.h> + +LPITEMIDLIST _CreateDummyPidl() +{ + /* Create a tiny pidl with no contents */ + LPITEMIDLIST testpidl = (LPITEMIDLIST)SHAlloc(3 * sizeof(WORD)); + testpidl->mkid.cb = 2 * sizeof(WORD); + *(WORD*)((char*)testpidl + (int)(2 * sizeof(WORD))) = 0; + + return testpidl; +} VOID TestUninitialized() { @@ -63,10 +73,7 @@ hr = psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); ok(hr == S_OK, "hr = %lx\n", hr); - /* Create a tiny pidl with no contents */ - LPITEMIDLIST testpidl = (LPITEMIDLIST)SHAlloc(3 * sizeof(WORD)); - testpidl->mkid.cb = 2 * sizeof(WORD); - *(WORD*)((char*)testpidl + (int)(2 * sizeof(WORD))) = 0; + LPITEMIDLIST testpidl = _CreateDummyPidl(); hr = ppf2->Initialize(testpidl); ok(hr == S_OK, "hr = %lx\n", hr); @@ -92,9 +99,72 @@ } +VOID TestInitialize() +{ + HRESULT hr; + STRRET strretName; + + /* Create a CFSFolder */ + CComPtr<IShellFolder> psf; + hr = CoCreateInstance(CLSID_ShellFSFolder, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellFolder, &psf)); + ok(hr == S_OK, "hr = %lx\n", hr); + + CComPtr<IPersistFolder3> ppf3; + hr = psf->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)); + ok(hr == S_OK, "hr = %lx\n", hr); + + LPITEMIDLIST testpidl = _CreateDummyPidl(); + PERSIST_FOLDER_TARGET_INFO pfti = {0}; + PERSIST_FOLDER_TARGET_INFO queriedPfti; + hr = ppf3->InitializeEx(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "hr = %lx\n", hr); + + hr = ppf3->InitializeEx(NULL, NULL, &pfti); + ok(hr == E_INVALIDARG, "hr = %lx\n", hr); + + wcscpy(pfti.szTargetParsingName, L"C:\\"); + hr = ppf3->InitializeEx(NULL, NULL, &pfti); + ok(hr == E_INVALIDARG, "hr = %lx\n", hr); + + hr = ppf3->InitializeEx(NULL, testpidl, NULL); + ok(hr == S_OK, "hr = %lx\n", hr); + + hr = ppf3->GetFolderTargetInfo(&queriedPfti); + ok(hr == E_FAIL, "hr = %lx\n", hr); + + hr = psf->GetDisplayNameOf(NULL,SHGDN_FORPARSING,&strretName); + ok(hr == E_FAIL, "hr = %lx\n", hr); + + pfti.szTargetParsingName[0] = 0; + hr = ppf3->InitializeEx(NULL, testpidl, &pfti); + ok(hr == S_OK, "hr = %lx\n", hr); + + hr = ppf3->GetFolderTargetInfo(&queriedPfti); + ok(hr == S_OK, "hr = %lx\n", hr); + ok(wcscmp(queriedPfti.szTargetParsingName, L"") == 0, "wrong name, got: %S\n", queriedPfti.szTargetParsingName); + + hr = psf->GetDisplayNameOf(NULL,SHGDN_FORPARSING,&strretName); + ok(hr == E_FAIL, "hr = %lx\n", hr); + + wcscpy(pfti.szTargetParsingName, L"C:\\"); + hr = ppf3->InitializeEx(NULL, testpidl, &pfti); + ok(hr == S_OK, "hr = %lx\n", hr); + + hr = ppf3->GetFolderTargetInfo(&queriedPfti); + ok(hr == S_OK, "hr = %lx\n", hr); + ok(wcscmp(queriedPfti.szTargetParsingName, L"C:\\") == 0, "wrong name, got: %S\n", queriedPfti.szTargetParsingName); + + hr = psf->GetDisplayNameOf(NULL,SHGDN_FORPARSING,&strretName); + ok(hr == S_OK, "hr = %lx\n", hr); + ok(strretName.uType == STRRET_WSTR, "strretName.uType == %x\n", strretName.uType); + ok(wcscmp(strretName.pOleStr, L"C:\\") == 0, "wrong name, got: %S\n", strretName.pOleStr); +} + + START_TEST(CFSFolder) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); TestUninitialized(); + TestInitialize(); }

1 0

[gadamopoulos] 73212: [SHELL32_APITEST] - Add tests for the Initialize method for CDesktopFolder and CDrivesFolder. - Add tests for CFSFolder to see how it behaves whhile not initialized.
by gadamopoulos＠svn.reactos.org 12 Nov '16

12 Nov '16

Author: gadamopoulos Date: Sat Nov 12 14:54:12 2016 New Revision: 73212 URL: http://svn.reactos.org/svn/reactos?rev=73212&view=rev Log: [SHELL32_APITEST] - Add tests for the Initialize method for CDesktopFolder and CDrivesFolder. - Add tests for CFSFolder to see how it behaves whhile not initialized. Added: trunk/rostests/apitests/shell32/CFSFolder.cpp (with props) Modified: trunk/rostests/apitests/shell32/CMakeLists.txt trunk/rostests/apitests/shell32/CMyComputer.cpp trunk/rostests/apitests/shell32/CShellDesktop.cpp trunk/rostests/apitests/shell32/testlist.c Added: trunk/rostests/apitests/shell32/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CFSFolde… ============================================================================== --- trunk/rostests/apitests/shell32/CFSFolder.cpp (added) +++ trunk/rostests/apitests/shell32/CFSFolder.cpp [iso-8859-1] Sat Nov 12 14:54:12 2016 @@ -0,0 +1,100 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for CMyComputer + * PROGRAMMER: Giannis Adamopoulos + */ + +#include "shelltest.h" +#include <atlbase.h> +#include <atlcom.h> +#include <strsafe.h> + +#define NDEBUG +#include <debug.h> +#include <shellutils.h> + +VOID TestUninitialized() +{ + CComPtr<IShellFolder> psf; + CComPtr<IEnumIDList> penum; + CComPtr<IDropTarget> pdt; + CComPtr<IContextMenu> pcm; + CComPtr<IShellView> psv; + LPITEMIDLIST retrievedPidl; + ULONG pceltFetched; + HRESULT hr; + + /* Create a CFSFolder */ + hr = CoCreateInstance(CLSID_ShellFSFolder, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellFolder, &psf)); + ok(hr == S_OK, "hr = %lx\n", hr); + + /* An uninitialized CFSFolder doesn't contain any items */ + hr = psf->EnumObjects(NULL, 0, &penum); + ok(hr == S_OK, "hr = %lx\n", hr); + hr = penum->Next(0, &retrievedPidl, &pceltFetched); + ok(hr == S_FALSE, "hr = %lx\n", hr); + hr = penum->Next(1, &retrievedPidl, &pceltFetched); + ok(hr == S_FALSE, "hr = %lx\n", hr); + + /* It supports viewing */ + hr = psf->CreateViewObject(NULL, IID_PPV_ARG(IDropTarget, &pdt)); + ok(hr == S_OK, "hr = %lx\n", hr); + hr = psf->CreateViewObject(NULL, IID_PPV_ARG(IContextMenu, &pcm)); + ok(hr == S_OK, "hr = %lx\n", hr); + hr = psf->CreateViewObject(NULL, IID_PPV_ARG(IShellView, &psv)); + ok(hr == S_OK, "hr = %lx\n", hr); + + /* And its display name is ... "C:\Documents and Settings\" */ + STRRET strretName; + hr = psf->GetDisplayNameOf(NULL,SHGDN_FORPARSING,&strretName); + ok(hr == S_OK, "hr = %lx\n", hr); + ok(strretName.uType == STRRET_WSTR, "strretName.uType == %x\n", strretName.uType); + ok(wcscmp(strretName.pOleStr, L"C:\\Documents and Settings\\") == 0, "wrong name, got: %S\n", strretName.pOleStr); + + hr = psf->GetDisplayNameOf(NULL,SHGDN_FORPARSING|SHGDN_INFOLDER,&strretName); + ok(hr == E_INVALIDARG, "hr = %lx\n", hr); + + + + + /* Use Initialize method with a dummy pidl and test the still non initialized CFSFolder */ + CComPtr<IPersistFolder2> ppf2; + hr = psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); + ok(hr == S_OK, "hr = %lx\n", hr); + + /* Create a tiny pidl with no contents */ + LPITEMIDLIST testpidl = (LPITEMIDLIST)SHAlloc(3 * sizeof(WORD)); + testpidl->mkid.cb = 2 * sizeof(WORD); + *(WORD*)((char*)testpidl + (int)(2 * sizeof(WORD))) = 0; + + hr = ppf2->Initialize(testpidl); + ok(hr == S_OK, "hr = %lx\n", hr); + + LPITEMIDLIST pidl; + hr = ppf2->GetCurFolder(&pidl); + ok(hr == S_OK, "hr = %lx\n", hr); + ok(pidl->mkid.cb == 2 * sizeof(WORD), "got wrong pidl size, cb = %x\n", pidl->mkid.cb); + + /* methods that worked before, now fail */ + hr = psf->GetDisplayNameOf(NULL,SHGDN_FORPARSING,&strretName); + ok(hr == E_FAIL, "hr = %lx\n", hr); + hr = psf->EnumObjects(NULL, 0, &penum); + ok(hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "hr = %lx\n", hr); + + /* The following continue to work though */ + hr = psf->CreateViewObject(NULL, IID_PPV_ARG(IDropTarget, &pdt)); + ok(hr == S_OK, "hr = %lx\n", hr); + hr = psf->CreateViewObject(NULL, IID_PPV_ARG(IContextMenu, &pcm)); + ok(hr == S_OK, "hr = %lx\n", hr); + hr = psf->CreateViewObject(NULL, IID_PPV_ARG(IShellView, &psv)); + ok(hr == S_OK, "hr = %lx\n", hr); + +} + +START_TEST(CFSFolder) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + TestUninitialized(); +} Propchange: trunk/rostests/apitests/shell32/CFSFolder.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMakeLis… ============================================================================== --- trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] Sat Nov 12 14:54:12 2016 @@ -4,6 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) add_executable(shell32_apitest + CFSFolder.cpp CMyComputer.cpp CShellDesktop.cpp CShellLink.cpp Modified: trunk/rostests/apitests/shell32/CMyComputer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMyCompu… ============================================================================== --- trunk/rostests/apitests/shell32/CMyComputer.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CMyComputer.cpp [iso-8859-1] Sat Nov 12 14:54:12 2016 @@ -49,6 +49,29 @@ ok(psv != psv_2, "Expected %p != %p\n", static_cast<PVOID>(psv), static_cast<PVOID>(psv_2)); } +VOID TestInitialize(_In_ IShellFolder2 *psf2) +{ + CComPtr<IPersistFolder2> ppf2; + HRESULT hr = psf2->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); + ok(hr == S_OK, "hr = %lx\n", hr); + + hr = ppf2->Initialize(NULL); + ok(hr == S_OK, "hr = %lx\n", hr); + + hr = ppf2->Initialize((LPCITEMIDLIST)0xdeaddead); + ok(hr == S_OK, "hr = %lx\n", hr); + + //crashes in xp + //hr = ppf2->GetCurFolder(NULL); + //ok(hr == E_INVALIDARG, "hr = %lx\n", hr); + + LPITEMIDLIST pidl; + hr = ppf2->GetCurFolder(&pidl); + ok(hr == S_OK, "hr = %lx\n", hr); + // 0 in win10, 14 in xp + ok(pidl->mkid.cb == 0x14, "expected empty pidl got cb = %x\n", pidl->mkid.cb); +} + START_TEST(CMyComputer) { HRESULT hr; @@ -78,4 +101,5 @@ ok(psf2 == psf2_2, "Expected %p == %p\n", static_cast<PVOID>(psf2), static_cast<PVOID>(psf2_2)); TestShellFolder(psf2); + TestInitialize(psf2); } Modified: trunk/rostests/apitests/shell32/CShellDesktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CShellDe… ============================================================================== --- trunk/rostests/apitests/shell32/CShellDesktop.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CShellDesktop.cpp [iso-8859-1] Sat Nov 12 14:54:12 2016 @@ -184,6 +184,34 @@ ok(psv != psv_2, "Expected %p != %p\n", static_cast<PVOID>(psv), static_cast<PVOID>(psv_2)); } +VOID TestInitialize(_In_ IShellFolder *psf) +{ + CComPtr<IPersistFolder2> ppf2; + HRESULT hr = psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); + ok(hr == S_OK, "hr = %lx\n", hr); + + /* Create a tiny pidl with no contents */ + LPITEMIDLIST testpidl = (LPITEMIDLIST)SHAlloc(3 * sizeof(WORD)); + testpidl->mkid.cb = 2 * sizeof(WORD); + *(WORD*)((char*)testpidl + (int)(2 * sizeof(WORD))) = 0; + + hr = ppf2->Initialize(testpidl); + ok(hr == E_INVALIDARG, "hr = %lx\n", hr); + + //crashes in xp, works on win10 + //hr = ppf2->Initialize(NULL); + //ok(hr == S_OK, "hr = %lx\n", hr); + //hr = ppf2->Initialize((LPCITEMIDLIST)0xdeaddead); + //ok(hr == S_OK, "hr = %lx\n", hr); + //hr = ppf2->GetCurFolder(NULL); + //ok(hr == E_INVALIDARG, "hr = %lx\n", hr); + + LPITEMIDLIST pidl; + hr = ppf2->GetCurFolder(&pidl); + ok(hr == S_OK, "hr = %lx\n", hr); + ok(pidl->mkid.cb == 0, "expected empty pidl got cb = %x\n", pidl->mkid.cb); +} + START_TEST(CShellDesktop) { HRESULT hr; @@ -219,4 +247,5 @@ TestShellFolder(psf2); TestCompareIDList(psf); -} + TestInitialize(psf); +} Modified: trunk/rostests/apitests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/testlist… ============================================================================== --- trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] Sat Nov 12 14:54:12 2016 @@ -3,6 +3,7 @@ #define STANDALONE #include <wine/test.h> +extern void func_CFSFolder(void); extern void func_CMyComputer(void); extern void func_CShellDesktop(void); extern void func_CShellLink(void); @@ -12,6 +13,7 @@ const struct test winetest_testlist[] = { + { "CFSFolder", func_CFSFolder }, { "CMyComputer", func_CMyComputer }, { "CShellDesktop", func_CShellDesktop }, { "CShellLink", func_CShellLink },

1 0

[tfaber] 73211: [PSEH3] - Avoid trying to disable 'declaration after statement' warnings in C++ CORE-11794
by tfaber＠svn.reactos.org 12 Nov '16

12 Nov '16

Author: tfaber Date: Sat Nov 12 14:52:58 2016 New Revision: 73211 URL: http://svn.reactos.org/svn/reactos?rev=73211&view=rev Log: [PSEH3] - Avoid trying to disable 'declaration after statement' warnings in C++ CORE-11794 Modified: trunk/reactos/sdk/include/reactos/libs/pseh/pseh3.h Modified: trunk/reactos/sdk/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/p… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sat Nov 12 14:52:58 2016 @@ -14,6 +14,12 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifdef __cplusplus +#define PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT +#else +#define PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT _Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") #endif /* CLANG must safe non-volatiles, because it uses a return-twice algorithm */ @@ -354,7 +360,7 @@ (void)&&_SEH3$_l_FilterOrFinally; \ \ _Pragma("GCC diagnostic push") \ -_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \ +PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Count the try level. Outside of any __try, _SEH3$_TryLevel is 0 */ \ enum { \ @@ -386,7 +392,7 @@ _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ \ _Pragma("GCC diagnostic push") \ -_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \ +PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Forward declaration of the filter function */ \ _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FilterFunction); \ @@ -436,7 +442,7 @@ _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \ \ _Pragma("GCC diagnostic push") \ -_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \ +PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \ \ /* Forward declaration of the finally function */ \ _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FinallyFunction); \

1 0

[tfaber] 73210: [SHELL32_APITEST] - Don't compare a pointer to S_OK CORE-11794
by tfaber＠svn.reactos.org 12 Nov '16

12 Nov '16

Author: tfaber Date: Sat Nov 12 12:43:02 2016 New Revision: 73210 URL: http://svn.reactos.org/svn/reactos?rev=73210&view=rev Log: [SHELL32_APITEST] - Don't compare a pointer to S_OK CORE-11794 Modified: trunk/rostests/apitests/shell32/menu.cpp Modified: trunk/rostests/apitests/shell32/menu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/menu.cpp… ============================================================================== --- trunk/rostests/apitests/shell32/menu.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/menu.cpp [iso-8859-1] Sat Nov 12 12:43:02 2016 @@ -257,7 +257,7 @@ struct _test_info *result = &m_results[m_iCallback-1]; - ok(psmd != S_OK, "Got NULL psmd\n"); + ok(psmd != NULL, "Got NULL psmd\n"); ok(m_iTest == result->iTest, "Wrong test number (%d not %d)\n", m_iTest, result->iTest); ok(result->uMsg == uMsg, "%d: Got wrong uMsg (%d instead of %d)\n", m_iCallback, uMsg, result->uMsg);

1 0

[tfaber] 73209: [MSWSOCK] - Remove broken 'inline' specifiers CORE-11794
by tfaber＠svn.reactos.org 12 Nov '16

12 Nov '16

Author: tfaber Date: Sat Nov 12 12:23:49 2016 New Revision: 73209 URL: http://svn.reactos.org/svn/reactos?rev=73209&view=rev Log: [MSWSOCK] - Remove broken 'inline' specifiers CORE-11794 Modified: trunk/reactos/dll/win32/mswsock/mswhelper.c trunk/reactos/dll/win32/mswsock/mswhelper.h Modified: trunk/reactos/dll/win32/mswsock/mswhelper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswhelpe… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswhelper.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/mswhelper.c [iso-8859-1] Sat Nov 12 12:23:49 2016 @@ -47,7 +47,6 @@ return TRUE; } -inline BYTE* mswBufferEndPtr(_Inout_ PMSW_BUFFER mswBuf) { Modified: trunk/reactos/dll/win32/mswsock/mswhelper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswhelpe… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswhelper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/mswhelper.h [iso-8859-1] Sat Nov 12 12:23:49 2016 @@ -17,7 +17,6 @@ _In_ BYTE* buffer, _In_ DWORD bufferSize); -inline BOOL mswBufferCheck( _Inout_ PMSW_BUFFER mswBuf, @@ -28,7 +27,6 @@ _Inout_ PMSW_BUFFER mswBuf, _In_ DWORD count); -inline BYTE* mswBufferEndPtr( _Inout_ PMSW_BUFFER mswBuf);

1 0

[pschweitzer] 73208: [SNDREC32] Don't double free buffers in case of failure
by pschweitzer＠svn.reactos.org 12 Nov '16

12 Nov '16

Author: pschweitzer Date: Sat Nov 12 09:24:09 2016 New Revision: 73208 URL: http://svn.reactos.org/svn/reactos?rev=73208&view=rev Log: [SNDREC32] Don't double free buffers in case of failure Modified: trunk/reactos/base/applications/sndrec32/audio_resampler_acm.cpp Modified: trunk/reactos/base/applications/sndrec32/audio_resampler_acm.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/audio_resampler_acm.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/audio_resampler_acm.cpp [iso-8859-1] Sat Nov 12 09:24:09 2016 @@ -126,10 +126,16 @@ { /* Free buffer memory */ if (acm_header.pbSrc != 0) + { delete[] acm_header.pbSrc; + acm_header.pbSrc = 0; + } if (acm_header.pbDst != 0) + { delete[] acm_header.pbDst; + acm_header.pbDst = 0; + } /* Re-init structures */ init_(); @@ -147,10 +153,16 @@ { /* Free buffer memory */ if (acm_header.pbSrc != 0) + { delete[] acm_header.pbSrc; + acm_header.pbSrc = 0; + } if (acm_header.pbDst != 0) + { delete[] acm_header.pbDst; + acm_header.pbDst = 0; + } /* Re-init structures */ init_();

1 0

[hbelusca] 73207: [EVENTVWR]: Fix translation for "Information" event type: it is really in singular, not plural.
by hbelusca＠svn.reactos.org 12 Nov '16

12 Nov '16

Author: hbelusca Date: Sat Nov 12 01:29:05 2016 New Revision: 73207 URL: http://svn.reactos.org/svn/reactos?rev=73207&view=rev Log: [EVENTVWR]: Fix translation for "Information" event type: it is really in singular, not plural. Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] Sat Nov 12 01:29:05 2016 @@ -148,7 +148,7 @@ BEGIN IDS_EVENTLOG_ERROR_TYPE "Fehler" IDS_EVENTLOG_WARNING_TYPE "Warnung" - IDS_EVENTLOG_INFORMATION_TYPE "Informationen" + IDS_EVENTLOG_INFORMATION_TYPE "Information" IDS_EVENTLOG_AUDIT_SUCCESS "Audit Erfolgreich" IDS_EVENTLOG_AUDIT_FAILURE "Audit Fehlgeschlagen" IDS_EVENTLOG_SUCCESS "Erfolgreich" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Sat Nov 12 01:29:05 2016 @@ -148,7 +148,7 @@ BEGIN IDS_EVENTLOG_ERROR_TYPE "Erreur" IDS_EVENTLOG_WARNING_TYPE "Avertissement" - IDS_EVENTLOG_INFORMATION_TYPE "Informations" + IDS_EVENTLOG_INFORMATION_TYPE "Information" IDS_EVENTLOG_AUDIT_SUCCESS "SuccÃ¨s de l'audit" IDS_EVENTLOG_AUDIT_FAILURE "Ãchec de l'audit" IDS_EVENTLOG_SUCCESS "SuccÃ¨s"

1 0

[hbelusca] 73206: [MSVCRT]: Implement and export _wtof, based on Wine and existing code; patch by Amine Khaldi. CORE-12335 #resolve CORE-9312 #comment Please retest with r73206
by hbelusca＠svn.reactos.org 11 Nov '16

11 Nov '16

Author: hbelusca Date: Fri Nov 11 23:32:29 2016 New Revision: 73206 URL: http://svn.reactos.org/svn/reactos?rev=73206&view=rev Log: [MSVCRT]: Implement and export _wtof, based on Wine and existing code; patch by Amine Khaldi. CORE-12335 #resolve CORE-9312 #comment Please retest with r73206 Added: trunk/reactos/sdk/lib/crt/string/wtof.c (with props) Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/sdk/lib/crt/crt.cmake Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Fri Nov 11 23:32:29 2016 @@ -761,7 +761,7 @@ @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) @ cdecl _wtmpnam(ptr) -# @ cdecl _wtof(wstr) +@ cdecl _wtof(wstr) @ cdecl _wtoi(wstr) @ cdecl _wtoi64(wstr) @ cdecl _wtol(wstr) Modified: trunk/reactos/sdk/lib/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/sdk/lib/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/crt.cmake [iso-8859-1] Fri Nov 11 23:32:29 2016 @@ -305,6 +305,7 @@ string/wcstombs_s.c string/wcstoul.c string/wctype.c + string/wtof.c string/wtoi.c string/wtoi64.c string/wtol.c Added: trunk/reactos/sdk/lib/crt/string/wtof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/wtof.c?… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/wtof.c (added) +++ trunk/reactos/sdk/lib/crt/string/wtof.c [iso-8859-1] Fri Nov 11 23:32:29 2016 @@ -0,0 +1,10 @@ +#include <precomp.h> + +/* + * @implemented + */ +double +_wtof(const wchar_t *str) +{ + return wcstod(str, 0); +} Propchange: trunk/reactos/sdk/lib/crt/string/wtof.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 73205: [MSAFD] - In C, void functions should better have 'VOID' mentioned in their prototypes. - Simplify GetCurrentTimeInSeconds code.
by hbelusca＠svn.reactos.org 11 Nov '16

11 Nov '16

Author: hbelusca Date: Fri Nov 11 21:37:09 2016 New Revision: 73205 URL: http://svn.reactos.org/svn/reactos?rev=73205&view=rev Log: [MSAFD] - In C, void functions should better have 'VOID' mentioned in their prototypes. - Simplify GetCurrentTimeInSeconds code. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri Nov 11 21:37:09 2016 @@ -1321,18 +1321,18 @@ } DWORD -GetCurrentTimeInSeconds() +GetCurrentTimeInSeconds(VOID) { - FILETIME Time; - FILETIME Adjustment; - ULARGE_INTEGER lTime, lAdj; - SYSTEMTIME st = { 1970,1,0,1,0,0,0 }; - SystemTimeToFileTime(&st, &Adjustment); - memcpy(&lAdj, &Adjustment, sizeof(lAdj)); - GetSystemTimeAsFileTime(&Time); - memcpy(&lTime, &Time, sizeof(lTime)); - lTime.QuadPart -= lAdj.QuadPart; - return (DWORD)(lTime.QuadPart / 10000000LLU); + SYSTEMTIME st1970 = { 1970, 1, 0, 1, 0, 0, 0, 0 }; + union + { + FILETIME ft; + ULONGLONG ll; + } u1970, Time; + + GetSystemTimeAsFileTime(&Time.ft); + SystemTimeToFileTime(&st1970, &u1970.ft); + return (DWORD)((Time.ll - u1970.ll) / 10000000ULL); } SOCKET

1 0

[hbelusca] 73204: [MSAFD]: Addendum to r73203.
by hbelusca＠svn.reactos.org 11 Nov '16

11 Nov '16

Author: hbelusca Date: Fri Nov 11 21:25:02 2016 New Revision: 73204 URL: http://svn.reactos.org/svn/reactos?rev=73204&view=rev Log: [MSAFD]: Addendum to r73203. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri Nov 11 21:25:02 2016 @@ -2056,7 +2056,7 @@ { IO_STATUS_BLOCK IOSB; ULONG TdiAddressSize; - PTDI_ADDRESS_INFO TdiAddress; + PTDI_ADDRESS_INFO TdiAddress; PTRANSPORT_ADDRESS SocketAddress; PSOCKET_INFORMATION Socket = NULL; NTSTATUS Status; @@ -2087,7 +2087,7 @@ /* Allocate a buffer for the address */ TdiAddressSize = - sizeof(TRANSPORT_ADDRESS) + Socket->SharedData->SizeOfLocalAddress; + sizeof(TRANSPORT_ADDRESS) + Socket->SharedData->SizeOfLocalAddress; TdiAddress = HeapAlloc(GlobalHeap, 0, TdiAddressSize); if ( TdiAddress == NULL ) @@ -3877,5 +3877,3 @@ } /* EOF */ - -

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