Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[pschweitzer] 73966: [FASTFAT] Finally fix a commented out check regarding directory type while opening a FAT volume

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Feb 26 18:46:30 2017 New Revision: 73966 URL: http://svn.reactos.org/svn/reactos?rev=73966&view=rev Log: [FASTFAT] Finally fix a commented out check regarding directory type while opening a FAT volume Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun Feb 26 18:46:30 2017 @@ -450,13 +450,12 @@ { return STATUS_ACCESS_DENIED; } -#if 0 - /* In spite of what is shown in WDK, it seems that Windows FAT driver doesn't perform that test */ - if (RequestedOptions & FILE_DIRECTORY_FILE) + + if (BooleanFlagOn(RequestedOptions, FILE_DIRECTORY_FILE) && + (FileObject->RelatedFileObject == NULL || FileObject->RelatedFileObject->FsContext2 == NULL || FileObject->RelatedFileObject->FsContext == DeviceExt->VolumeFcb)) { return STATUS_NOT_A_DIRECTORY; } -#endif if (OpenTargetDir) {

7 years, 10 months

[akhaldi] 73965: [MSG711.ACM] Sync with Wine Staging 2.2. CORE-12823 d132488 msg711.acm: Remove an empty fixme. 5bdc868 msg711.acm: Remove dead code in G711_FormatSuggest.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 18:36:43 2017 New Revision: 73965 URL: http://svn.reactos.org/svn/reactos?rev=73965&view=rev Log: [MSG711.ACM] Sync with Wine Staging 2.2. CORE-12823 d132488 msg711.acm: Remove an empty fixme. 5bdc868 msg711.acm: Remove dead code in G711_FormatSuggest. Modified: trunk/reactos/dll/win32/msg711.acm/msg711.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msg711.acm/msg711.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/msg71… ============================================================================== --- trunk/reactos/dll/win32/msg711.acm/msg711.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msg711.acm/msg711.c [iso-8859-1] Sun Feb 26 18:36:43 2017 @@ -844,9 +844,6 @@ case WAVE_FORMAT_MULAW: adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels; - break; - default: - FIXME("\n"); break; } @@ -1045,7 +1042,6 @@ WARN("Unsupported query %08x\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } - FIXME("\n"); return MMSYSERR_NOERROR; } 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] Sun Feb 26 18:36:43 2017 @@ -108,7 +108,7 @@ reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-2.2 reactos/dll/win32/msftedit # Synced to WineStaging-1.9.11 -reactos/dll/win32/msg711.acm # Synced to WineStaging-1.9.11 +reactos/dll/win32/msg711.acm # Synced to WineStaging-2.2 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55

7 years, 10 months

[akhaldi] 73964: [MSCTF_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 18:34:24 2017 New Revision: 73964 URL: http://svn.reactos.org/svn/reactos?rev=73964&view=rev Log: [MSCTF_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/msctf/inputprocessor.c Modified: trunk/rostests/winetests/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/inputproc… ============================================================================== --- trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] Sun Feb 26 18:34:24 2017 @@ -1550,11 +1550,11 @@ ITfDocumentMgr_Release(dmtest); hr = TextStoreACP_Constructor((IUnknown**)&ts); - if (SUCCEEDED(hr)) - { - hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt, &editCookie); - ok(SUCCEEDED(hr),"CreateContext Failed\n"); - } + ok(SUCCEEDED(hr),"Constructor Failed\n"); + if (FAILED(hr)) return; + + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt, &editCookie); + ok(SUCCEEDED(hr),"CreateContext Failed\n"); hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, NULL, &cxt2, &editCookie); ok(SUCCEEDED(hr),"CreateContext Failed\n"); @@ -2175,11 +2175,11 @@ test_CurrentFocus = dm1; test_PrevFocus = FOCUS_IGNORE; test_OnSetFocus = SINK_OPTIONAL; - test_ShouldDeactivate = SINK_OPTIONAL; + test_ShouldDeactivate = TRUE; hr = ITfThreadMgr_AssociateFocus(g_tm,wnd1,dm1,&olddm); ok(SUCCEEDED(hr),"AssociateFocus failed\n"); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); - test_ShouldDeactivate = SINK_UNEXPECTED; + test_ShouldDeactivate = FALSE; processPendingMessages(); @@ -2211,12 +2211,14 @@ test_CurrentFocus = FOCUS_SAVE; test_PrevFocus = FOCUS_SAVE; test_OnSetFocus = SINK_SAVE; + test_ShouldDeactivate = TRUE; /* win 8/10 */ ShowWindow(wnd2,SW_SHOWNORMAL); SetFocus(wnd2); sink_check_saved(&test_OnSetFocus,dm1,dm2,"OnSetFocus"); test_CurrentFocus = FOCUS_IGNORE; /* occasional wine race */ test_PrevFocus = FOCUS_IGNORE; /* occasional wine race */ test_OnSetFocus = SINK_IGNORE; /* occasional wine race */ + test_ShouldDeactivate = FALSE; processPendingMessages(); ShowWindow(wnd3,SW_SHOWNORMAL);

7 years, 10 months

[akhaldi] 73963: [MSCTF] Sync with Wine Staging 2.2. CORE-12823 7bcca92 msctf: Return proper pointer to interface. 04b97c2 msctf: Allow unadvising ITfThreadFocusSink. 7ebe59b msctf: Use correct sin...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 18:33:14 2017 New Revision: 73963 URL: http://svn.reactos.org/svn/reactos?rev=73963&view=rev Log: [MSCTF] Sync with Wine Staging 2.2. CORE-12823 7bcca92 msctf: Return proper pointer to interface. 04b97c2 msctf: Allow unadvising ITfThreadFocusSink. 7ebe59b msctf: Use correct sink for ITfThreadFocusSink. d766288 msctf: Remove incorrect dereference of double pointer. 137166f msctf: Use interface pointer instead of object pointer. Modified: trunk/reactos/dll/win32/msctf/msctf.c trunk/reactos/dll/win32/msctf/msctf_internal.h trunk/reactos/dll/win32/msctf/threadmgr.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msctf/msctf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.c?re… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] Sun Feb 26 18:33:14 2017 @@ -162,7 +162,7 @@ This->IClassFactory_iface.lpVtbl = &ClassFactoryVtbl; This->ref = 1; This->ctor = ctor; - *ppvOut = This; + *ppvOut = &This->IClassFactory_iface; TRACE("Created class factory %p\n", This); return S_OK; } Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inte… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] Sun Feb 26 18:33:14 2017 @@ -52,6 +52,7 @@ #define COOKIE_MAGIC_EDITCOOKIE 0x0050 #define COOKIE_MAGIC_COMPARTMENTSINK 0x0060 #define COOKIE_MAGIC_DMSINK 0x0070 +#define COOKIE_MAGIC_THREADFOCUSSINK 0x0080 extern DWORD tlsIndex DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/msctf/threadmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.… ============================================================================== --- trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] Sun Feb 26 18:33:14 2017 @@ -597,7 +597,7 @@ if (IsEqualIID(riid, &IID_ITfThreadFocusSink)) { WARN("semi-stub for ITfThreadFocusSink: sink won't be used.\n"); - return advise_sink(&This->ThreadMgrEventSink, &IID_ITfThreadMgrEventSink, COOKIE_MAGIC_TMSINK, punk, pdwCookie); + return advise_sink(&This->ThreadFocusSink, &IID_ITfThreadFocusSink, COOKIE_MAGIC_THREADFOCUSSINK, punk, pdwCookie); } FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); @@ -610,7 +610,7 @@ TRACE("(%p) %x\n",This,pdwCookie); - if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_TMSINK) + if (get_Cookie_magic(pdwCookie) != COOKIE_MAGIC_TMSINK && get_Cookie_magic(pdwCookie) != COOKIE_MAGIC_THREADFOCUSSINK) return E_INVALIDARG; return unadvise_sink(pdwCookie); @@ -1166,7 +1166,7 @@ { ThreadMgr *This = impl_from_ITfUIElementMgr(iface); - return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, *ppvOut); + return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut); } static ULONG WINAPI UIElementMgr_AddRef(ITfUIElementMgr *iface) @@ -1315,7 +1315,7 @@ This->refCount = 1; TlsSetValue(tlsIndex,This); - CompartmentMgr_Constructor((IUnknown*)This, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + CompartmentMgr_Constructor((IUnknown*)&This->ITfThreadMgrEx_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); list_init(&This->CurrentPreservedKeys); list_init(&This->CreatedDocumentMgrs); 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] Sun Feb 26 18:33:14 2017 @@ -106,7 +106,7 @@ reactos/dll/win32/mscat32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mscms # Synced to WineStaging-2.2 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to WineStaging-1.9.23 +reactos/dll/win32/msctf # Synced to WineStaging-2.2 reactos/dll/win32/msftedit # Synced to WineStaging-1.9.11 reactos/dll/win32/msg711.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73962: [MSCMS] Sync with Wine Staging 2.2. CORE-12823 321b34d mscms: Fix some spec file entries.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 18:26:43 2017 New Revision: 73962 URL: http://svn.reactos.org/svn/reactos?rev=73962&view=rev Log: [MSCMS] Sync with Wine Staging 2.2. CORE-12823 321b34d mscms: Fix some spec file entries. Modified: trunk/reactos/dll/win32/mscms/mscms.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mscms/mscms.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms.spec… ============================================================================== --- trunk/reactos/dll/win32/mscms/mscms.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/mscms.spec [iso-8859-1] Sun Feb 26 18:26:43 2017 @@ -18,13 +18,13 @@ @ stdcall EnumColorProfilesW(ptr ptr ptr ptr ptr) @ stdcall GenerateCopyFilePaths(wstr wstr ptr long ptr ptr ptr ptr long) @ stdcall GetCMMInfo(ptr long) -@ stdcall GetColorDirectoryA(ptr ptr long) -@ stdcall GetColorDirectoryW(ptr ptr long) +@ stdcall GetColorDirectoryA(ptr ptr ptr) +@ stdcall GetColorDirectoryW(ptr ptr ptr) @ stdcall GetColorProfileElement(ptr long long ptr ptr ptr) @ stdcall GetColorProfileElementTag(ptr long ptr) @ stdcall GetColorProfileFromHandle(ptr ptr ptr) @ stdcall GetColorProfileHeader(ptr ptr) -@ stdcall GetCountColorProfileElements(ptr long) +@ stdcall GetCountColorProfileElements(ptr ptr) @ stdcall GetNamedProfileInfo(ptr ptr) @ stdcall GetPS2ColorRenderingDictionary(ptr long ptr ptr ptr) @ stdcall GetPS2ColorRenderingIntent(ptr long ptr ptr) @@ -40,7 +40,7 @@ @ stub InternalGetPS2PreviewCRD @ stub InternalSetDeviceConfig @ stdcall IsColorProfileTagPresent(ptr long ptr) -@ stdcall IsColorProfileValid(ptr long) +@ stdcall IsColorProfileValid(ptr ptr) @ stdcall OpenColorProfileA(ptr long long long) @ stdcall OpenColorProfileW(ptr long long long) @ stdcall RegisterCMMA(ptr long ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 18:26:43 2017 @@ -104,7 +104,7 @@ reactos/dll/win32/msacm32.drv # Synced to WineStaging-1.9.11 reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/mscat32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mscms # Synced to WineStaging-1.9.11 +reactos/dll/win32/mscms # Synced to WineStaging-2.2 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-1.9.23 reactos/dll/win32/msftedit # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73961: [MSACM32_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 18:23:11 2017 New Revision: 73961 URL: http://svn.reactos.org/svn/reactos?rev=73961&view=rev Log: [MSACM32_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/msacm32/CMakeLists.txt trunk/rostests/winetests/msacm32/msacm.c Modified: trunk/rostests/winetests/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msacm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msacm32/CMakeLists.txt [iso-8859-1] Sun Feb 26 18:23:11 2017 @@ -1,5 +1,5 @@ add_executable(msacm32_winetest msacm.c testlist.c) set_module_type(msacm32_winetest win32cui) -add_importlibs(msacm32_winetest msacm32 msvcrt kernel32) +add_importlibs(msacm32_winetest msacm32 winmm msvcrt kernel32) add_rostests_file(TARGET msacm32_winetest) Modified: trunk/rostests/winetests/msacm32/msacm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/msacm.c… ============================================================================== --- trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] Sun Feb 26 18:23:11 2017 @@ -31,6 +31,7 @@ #define NOBITMAP #include "mmreg.h" #include "msacm.h" +#include "wine/msacmdrv.h" static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, PACMFORMATTAGDETAILSA paftd, @@ -829,6 +830,7 @@ ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); } + void test_mp3(void) { MPEGLAYER3WAVEFORMAT src; @@ -899,10 +901,175 @@ ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); } +static struct +{ + struct + { + int load, free, open, close, enable, disable, install, + remove, details, notify, querycfg, about; + } driver; + struct + { + int tag_details, details, suggest; + } format; + struct + { + int open, close, size, convert, prepare, unprepare, reset; + } stream; + int other; +} driver_calls; + +static LRESULT CALLBACK acm_driver_func(DWORD_PTR id, HDRVR handle, UINT msg, LPARAM param1, LPARAM param2) +{ + switch (msg) + { + /* Driver messages */ + case DRV_LOAD: + driver_calls.driver.load++; + return 1; + case DRV_FREE: + driver_calls.driver.free++; + return 1; + case DRV_OPEN: + driver_calls.driver.open++; + return 1; + case DRV_CLOSE: + driver_calls.driver.close++; + return 1; + case DRV_ENABLE: + driver_calls.driver.enable++; + return 1; + case DRV_DISABLE: + driver_calls.driver.disable++; + return 1; + case DRV_QUERYCONFIGURE: + driver_calls.driver.querycfg++; + return 1; + case DRV_INSTALL: + driver_calls.driver.install++; + return DRVCNF_RESTART; + case DRV_REMOVE: + driver_calls.driver.remove++; + return DRVCNF_RESTART; + case ACMDM_DRIVER_ABOUT: + driver_calls.driver.about++; + return MMSYSERR_NOTSUPPORTED; + case ACMDM_DRIVER_DETAILS: + { + ACMDRIVERDETAILSA *ptr = (ACMDRIVERDETAILSA *)param1; + + /* copied from pcmconverter.c */ + ptr->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC; + ptr->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; + ptr->wMid = MM_MICROSOFT; + ptr->wPid = MM_MSFT_ACM_PCM; + ptr->vdwACM = 0x01000000; + ptr->vdwDriver = 0x01000000; + ptr->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER; + ptr->cFormatTags = 1; + ptr->cFilterTags = 0; + ptr->hicon = NULL; + strcpy(ptr->szShortName, "TEST-CODEC"); + strcpy(ptr->szLongName, "Wine Test Codec"); + strcpy(ptr->szCopyright, "Brought to you by the Wine team..."); + strcpy(ptr->szLicensing, "Refer to LICENSE file"); + ptr->szFeatures[0] = 0; + + driver_calls.driver.details++; + break; + } + case ACMDM_DRIVER_NOTIFY: + driver_calls.driver.notify++; + return MMSYSERR_NOTSUPPORTED; + + /* Format messages */ + case ACMDM_FORMATTAG_DETAILS: + driver_calls.format.tag_details++; + break; + case ACMDM_FORMAT_DETAILS: + driver_calls.format.details++; + break; + case ACMDM_FORMAT_SUGGEST: + driver_calls.format.suggest++; + break; + + /* Stream messages */ + case ACMDM_STREAM_OPEN: + driver_calls.stream.open++; + break; + case ACMDM_STREAM_CLOSE: + driver_calls.stream.close++; + break; + case ACMDM_STREAM_SIZE: + driver_calls.stream.size++; + break; + case ACMDM_STREAM_CONVERT: + driver_calls.stream.convert++; + break; + case ACMDM_STREAM_RESET: + driver_calls.stream.reset++; + return MMSYSERR_NOTSUPPORTED; + case ACMDM_STREAM_PREPARE: + driver_calls.stream.prepare++; + break; + case ACMDM_STREAM_UNPREPARE: + driver_calls.stream.unprepare++; + break; + + default: + driver_calls.other++; + return DefDriverProc(id, handle, msg, param1, param2); + } + return MMSYSERR_NOERROR; +} + +static void test_acmDriverAdd(void) +{ + MMRESULT res; + HACMDRIVERID drvid; + union + { + ACMDRIVERDETAILSA drv_details; + } acm; + + /* Driver load steps: + * - acmDriverAdd checks the passed parameters + * - DRV_LOAD message is sent - required + * - DRV_ENABLE message is sent - required + * - DRV_OPEN message is sent - required + * - DRV_DETAILS message is sent - required + * - ACMDM_FORMATTAG_DETAILS message is sent - optional + * - DRV_QUERYCONFIGURE message is sent - optional + * - ACMDM_DRIVER_ABOUT message is sent - optional + */ + + res = acmDriverAddA(&drvid, GetModuleHandleA(NULL), (LPARAM)acm_driver_func, 0, ACM_DRIVERADDF_FUNCTION); + ok(res == MMSYSERR_NOERROR, "Expected 0, got %d\n", res); +todo_wine + ok(driver_calls.driver.open == 1, "Expected 1, got %d\n", driver_calls.driver.open); + ok(driver_calls.driver.details == 1, "Expected 1, got %d\n", driver_calls.driver.details); + + memset(&acm, 0, sizeof(acm)); + res = acmDriverDetailsA(drvid, &acm.drv_details, 0); + ok(res == MMSYSERR_INVALPARAM, "Expected 11, got %d\n", res); + + acm.drv_details.cbStruct = sizeof(acm.drv_details); + res = acmDriverDetailsA(drvid, &acm.drv_details, 0); + ok(res == MMSYSERR_NOERROR, "Expected 0, got %d\n", res); +todo_wine + ok(driver_calls.driver.open == 1, "Expected 1, got %d\n", driver_calls.driver.open); + ok(driver_calls.driver.details == 2, "Expected 2, got %d\n", driver_calls.driver.details); +todo_wine + ok(driver_calls.driver.close == 0, "Expected 0, got %d\n", driver_calls.driver.close); +} + START_TEST(msacm) { driver_tests(); test_prepareheader(); test_acmFormatSuggest(); test_mp3(); -} + /* Test acmDriverAdd in the end as it may conflict + * with other tests due to codec lookup order */ + test_acmDriverAdd(); +}

7 years, 10 months

[akhaldi] 73960: [MSACM32] Sync with Wine Staging 2.2. CORE-12823 0afcefd msacm32: Reduce block align condition scope to test covered drivers. 55fdb03 msacm32: Fix copy-paste error. 6cc6734 msacm32...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 18:19:34 2017 New Revision: 73960 URL: http://svn.reactos.org/svn/reactos?rev=73960&view=rev Log: [MSACM32] Sync with Wine Staging 2.2. CORE-12823 0afcefd msacm32: Reduce block align condition scope to test covered drivers. 55fdb03 msacm32: Fix copy-paste error. 6cc6734 msacm32: Support conversion from 24-bit PCM. Modified: trunk/reactos/dll/win32/msacm32/pcmconverter.c trunk/reactos/dll/win32/msacm32/stream.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msacm32/pcmconverter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/pcmconve… ============================================================================== --- trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] Sun Feb 26 18:19:34 2017 @@ -76,12 +76,12 @@ int nBits; int rate; } PCM_Formats[] = { - {1, 8, 8000}, {2, 8, 8000}, {1, 16, 8000}, {2, 16, 8000}, - {1, 8, 11025}, {2, 8, 11025}, {1, 16, 11025}, {2, 16, 11025}, - {1, 8, 22050}, {2, 8, 22050}, {1, 16, 22050}, {2, 16, 22050}, - {1, 8, 44100}, {2, 8, 44100}, {1, 16, 44100}, {2, 16, 44100}, - {1, 8, 48000}, {2, 8, 48000}, {1, 16, 48000}, {2, 16, 48000}, - {1, 8, 96000}, {2, 8, 96000}, {1, 16, 96000}, {2, 16, 96000} + {1, 8, 8000}, {2, 8, 8000}, {1, 16, 8000}, {2, 16, 8000}, {1, 24, 8000}, {2, 24, 8000}, + {1, 8, 11025}, {2, 8, 11025}, {1, 16, 11025}, {2, 16, 11025}, {1, 24, 11025}, {2, 24, 11025}, + {1, 8, 22050}, {2, 8, 22050}, {1, 16, 22050}, {2, 16, 22050}, {1, 24, 22050}, {2, 24, 22050}, + {1, 8, 44100}, {2, 8, 44100}, {1, 16, 44100}, {2, 16, 44100}, {1, 24, 44100}, {2, 24, 44100}, + {1, 8, 48000}, {2, 8, 48000}, {1, 16, 48000}, {2, 16, 48000}, {1, 24, 48000}, {2, 24, 48000}, + {1, 8, 96000}, {2, 8, 96000}, {1, 16, 96000}, {2, 16, 96000}, {1, 24, 96000}, {2, 24, 96000}, }; /*********************************************************************** @@ -134,6 +134,26 @@ } /*********************************************************************** + * C248 + * + * Converts a 24 bit sample to a 8 bit one (data loss !!) + */ +static inline unsigned char C248(int s) +{ + return HIBYTE(HIWORD(s)) ^ (unsigned char)0x80; +} + +/*********************************************************************** + * C2416 + * + * Converts a 24 bit sample to a 16 bit one (data loss !!) + */ +static inline short C2416(int s) +{ + return HIWORD(s); +} + +/*********************************************************************** * R16 * * Read a 16 bit sample (correctly handles endianness) @@ -141,6 +161,18 @@ static inline short R16(const unsigned char* src) { return (short)((unsigned short)src[0] | ((unsigned short)src[1] << 8)); +} + +/*********************************************************************** + * R24 + * + * Read a 24 bit sample (correctly handles endianness) + * Note, to support signed arithmetic, the values are shifted high in the int + * and low 8 bytes are unused. + */ +static inline int R24(const unsigned char* src) +{ + return ((int)src[0] | (int)src[1] << 8 | (int)src[2] << 16) << 8; } /*********************************************************************** @@ -152,6 +184,37 @@ { dst[0] = LOBYTE(s); dst[1] = HIBYTE(s); +} + +/*********************************************************************** + * W24 + * + * Write a 24 bit sample (correctly handles endianness) + */ +static inline void W24(unsigned char* dst, int s) +{ + dst[0] = HIBYTE(LOWORD(s)); + dst[1] = LOBYTE(HIWORD(s)); + dst[2] = HIBYTE(HIWORD(s)); +} + +/*********************************************************************** + * M24 + * + * Convert the (l,r) 24 bit stereo sample into a 24 bit mono + * (takes the sum of the two values) + */ +static inline int M24(int l, int r) +{ + LONGLONG sum = l + r; + + /* clip sum to saturation */ + if (sum > 0x7fffff00) + sum = 0x7fffff00; + else if (sum < -0x7fffff00) + sum = -0x7fffff00; + + return sum; } /*********************************************************************** @@ -355,14 +418,102 @@ } } +static void cvtMS248K(const unsigned char* src, int ns, unsigned char* dst) +{ + unsigned char v; + TRACE("(%p, %d, %p)\n", src, ns, dst); + + while (ns--) { + v = C248(R24(src)); src += 3; + *dst++ = v; + *dst++ = v; + } +} + +static void cvtSM248K(const unsigned char* src, int ns, unsigned char* dst) +{ + TRACE("(%p, %d, %p)\n", src, ns, dst); + + while (ns--) { + *dst++ = C248(M24(R24(src), R24(src + 3))); + src += 6; + } +} + +static void cvtMM248K(const unsigned char* src, int ns, unsigned char* dst) +{ + TRACE("(%p, %d, %p)\n", src, ns, dst); + + while (ns--) { + *dst++ = C248(R24(src)); src += 3; + } +} + +static void cvtSS248K(const unsigned char* src, int ns, unsigned char* dst) +{ + TRACE("(%p, %d, %p)\n", src, ns, dst); + + while (ns--) { + *dst++ = C248(R24(src)); src += 3; + *dst++ = C248(R24(src)); src += 3; + } +} + +static void cvtMS2416K(const unsigned char* src, int ns, unsigned char* dst) +{ + short v; + TRACE("(%p, %d, %p)\n", src, ns, dst); + + while (ns--) { + v = C2416(R24(src)); src += 3; + W16(dst, v); dst += 2; + W16(dst, v); dst += 2; + } +} + +static void cvtSM2416K(const unsigned char* src, int ns, unsigned char* dst) +{ + TRACE("(%p, %d, %p)\n", src, ns, dst); + + while (ns--) { + W16(dst, C2416(M24(R24(src), R24(src + 3)))); + dst += 2; + src += 6; + } +} + +static void cvtMM2416K(const unsigned char* src, int ns, unsigned char* dst) +{ + TRACE("(%p, %d, %p)\n", src, ns, dst); + + while (ns--) { + W16(dst, C2416(R24(src))); dst += 2; src += 3; + } +} + +static void cvtSS2416K(const unsigned char* src, int ns, unsigned char* dst) +{ + TRACE("(%p, %d, %p)\n", src, ns, dst); + + while (ns--) { + W16(dst, C2416(R24(src))); dst += 2; src += 3; + W16(dst, C2416(R24(src))); dst += 2; src += 3; + } +} + typedef void (*PCM_CONVERT_KEEP_RATE)(const unsigned char*, int, unsigned char*); -static const PCM_CONVERT_KEEP_RATE PCM_ConvertKeepRate[16] = { +static const PCM_CONVERT_KEEP_RATE PCM_ConvertKeepRate[] = { cvtSS88K, cvtSM88K, cvtMS88K, cvtMM88K, cvtSS816K, cvtSM816K, cvtMS816K, cvtMM816K, + NULL, NULL, NULL, NULL, /* TODO: 8->24 */ cvtSS168K, cvtSM168K, cvtMS168K, cvtMM168K, cvtSS1616K, cvtSM1616K, cvtMS1616K, cvtMM1616K, + NULL, NULL, NULL, NULL, /* TODO: 16->24 */ + cvtSS248K, cvtSM248K, cvtMS248K, cvtMM248K, + cvtSS2416K, cvtSM2416K, cvtMS2416K, cvtMM2416K, + NULL, NULL, NULL, NULL, /* TODO: 24->24 */ }; /* the conversion routines with rate conversion are labelled cvt<X><Y><N><M>C @@ -685,13 +836,96 @@ } } +static void cvtSS2424C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, + DWORD dstRate, unsigned char* dst, LPDWORD ndst) +{ + DWORD error = dstRate / 2; + TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); + + while ((*ndst)--) { + W24(dst, R24(src)); dst += 3; + W24(dst, R24(src)); dst += 3; + error = error + srcRate; + while (error > dstRate) { + src += 6; + (*nsrc)--; + if (*nsrc == 0) + return; + error = error - dstRate; + } + } +} + +static void cvtSM2424C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, + DWORD dstRate, unsigned char* dst, LPDWORD ndst) +{ + DWORD error = dstRate / 2; + TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); + + while ((*ndst)--) { + W24(dst, M24(R24(src), R24(src + 3))); dst += 3; + error = error + srcRate; + while (error > dstRate) { + src += 6; + (*nsrc)--; + if (*nsrc == 0) + return; + error = error - dstRate; + } + } +} + +static void cvtMS2424C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, + DWORD dstRate, unsigned char* dst, LPDWORD ndst) +{ + DWORD error = dstRate / 2; + TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); + + while((*ndst)--) { + W24(dst, R24(src)); dst += 3; + W24(dst, R24(src)); dst += 3; + error = error + srcRate; + while (error > dstRate) { + src += 3; + (*nsrc)--; + if (*nsrc == 0) + return; + error = error - dstRate; + } + } +} + +static void cvtMM2424C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, + DWORD dstRate, unsigned char* dst, LPDWORD ndst) +{ + DWORD error = dstRate / 2; + TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); + + while ((*ndst)--) { + W24(dst, R24(src)); dst += 3; + error = error + srcRate; + while (error > dstRate) { + src += 3; + (*nsrc)--; + if (*nsrc == 0) + return; + error = error - dstRate; + } + } +} + typedef void (*PCM_CONVERT_CHANGE_RATE)(DWORD, const unsigned char*, LPDWORD, DWORD, unsigned char*, LPDWORD); -static const PCM_CONVERT_CHANGE_RATE PCM_ConvertChangeRate[16] = { +static const PCM_CONVERT_CHANGE_RATE PCM_ConvertChangeRate[] = { cvtSS88C, cvtSM88C, cvtMS88C, cvtMM88C, cvtSS816C, cvtSM816C, cvtMS816C, cvtMM816C, + NULL, NULL, NULL, NULL, /* TODO: 8->24 */ cvtSS168C, cvtSM168C, cvtMS168C, cvtMM168C, cvtSS1616C, cvtSM1616C, cvtMS1616C, cvtMM1616C, + NULL, NULL, NULL, NULL, /* TODO: 16->24 */ + NULL, NULL, NULL, NULL, /* TODO: 24->8 */ + NULL, NULL, NULL, NULL, /* TODO: 24->16 */ + cvtSS2424C, cvtSM2424C, cvtMS2424C, cvtMM2424C, }; /*********************************************************************** @@ -867,33 +1101,77 @@ */ static LRESULT PCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) { - AcmPcmData* apd; - int idx = 0; + AcmPcmData* apd; + int idx; + DWORD flags; TRACE("(%p)\n", adsi); assert(!(adsi->fdwOpen & ACM_STREAMOPENF_ASYNC)); + switch(adsi->pwfxSrc->wBitsPerSample){ + case 8: + idx = 0; + break; + case 16: + idx = 12; + break; + case 24: + if (adsi->pwfxSrc->nBlockAlign != 3 * adsi->pwfxSrc->nChannels) { + FIXME("Source: 24-bit samples must be packed\n"); + return MMSYSERR_NOTSUPPORTED; + } + idx = 24; + break; + default: + FIXME("Unsupported source bit depth: %u\n", adsi->pwfxSrc->wBitsPerSample); + return MMSYSERR_NOTSUPPORTED; + } + + switch(adsi->pwfxDst->wBitsPerSample){ + case 8: + break; + case 16: + idx += 4; + break; + case 24: + if (adsi->pwfxDst->nBlockAlign != 3 * adsi->pwfxDst->nChannels) { + FIXME("Destination: 24-bit samples must be packed\n"); + return MMSYSERR_NOTSUPPORTED; + } + idx += 8; + break; + default: + FIXME("Unsupported destination bit depth: %u\n", adsi->pwfxDst->wBitsPerSample); + return MMSYSERR_NOTSUPPORTED; + } + + if (adsi->pwfxSrc->nChannels == 1) idx += 2; + + if (adsi->pwfxDst->nChannels == 1) idx += 1; + apd = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmPcmData)); - if (apd == 0) { - WARN("no memory\n"); + if (!apd) return MMSYSERR_NOMEM; + + if (adsi->pwfxSrc->nSamplesPerSec == adsi->pwfxDst->nSamplesPerSec) { + flags = 0; + apd->cvt.cvtKeepRate = PCM_ConvertKeepRate[idx]; + } else { + flags = PCM_RESAMPLE; + apd->cvt.cvtChangeRate = PCM_ConvertChangeRate[idx]; + } + + if(!apd->cvt.cvtChangeRate && !apd->cvt.cvtKeepRate){ + FIXME("Unimplemented conversion from %u -> %u bps\n", + adsi->pwfxSrc->wBitsPerSample, + adsi->pwfxDst->wBitsPerSample); + HeapFree(GetProcessHeap(), 0, apd); + return MMSYSERR_NOTSUPPORTED; } adsi->dwDriver = (DWORD_PTR)apd; - adsi->fdwDriver = 0; - - if (adsi->pwfxSrc->wBitsPerSample == 16) idx += 8; - if (adsi->pwfxDst->wBitsPerSample == 16) idx += 4; - if (adsi->pwfxSrc->nChannels == 1) idx += 2; - if (adsi->pwfxDst->nChannels == 1) idx += 1; - - if (adsi->pwfxSrc->nSamplesPerSec == adsi->pwfxDst->nSamplesPerSec) { - apd->cvt.cvtKeepRate = PCM_ConvertKeepRate[idx]; - } else { - adsi->fdwDriver |= PCM_RESAMPLE; - apd->cvt.cvtChangeRate = PCM_ConvertChangeRate[idx]; - } + adsi->fdwDriver = flags; return MMSYSERR_NOERROR; } Modified: trunk/reactos/dll/win32/msacm32/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/stream.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/stream.c [iso-8859-1] Sun Feb 26 18:19:34 2017 @@ -304,7 +304,9 @@ WARN("invalid use of reserved parameter\n"); return MMSYSERR_INVALFLAG; } - if (pash->cbSrcLength < was->drvInst.pwfxSrc->nBlockAlign) { + if ((was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM || + was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) && + pash->cbSrcLength < was->drvInst.pwfxSrc->nBlockAlign) { WARN("source smaller than block align (%d < %d)\n", pash->cbSrcLength, was->drvInst.pwfxSrc->nBlockAlign); return pash->cbSrcLength ? ACMERR_NOTPOSSIBLE : MMSYSERR_INVALPARAM; 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] Sun Feb 26 18:19:34 2017 @@ -100,7 +100,7 @@ reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.23 reactos/dll/win32/mpr # Synced to WineStaging-2.2 reactos/dll/win32/mprapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/msacm32 # Synced to WineStaging-1.9.23 +reactos/dll/win32/msacm32 # Synced to WineStaging-2.2 reactos/dll/win32/msacm32.drv # Synced to WineStaging-1.9.11 reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/mscat32 # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73959: [MPR] Sync with Wine Staging 2.2. CORE-12823 3540a3d mpr: Fix some spec file entries.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 18:07:39 2017 New Revision: 73959 URL: http://svn.reactos.org/svn/reactos?rev=73959&view=rev Log: [MPR] Sync with Wine Staging 2.2. CORE-12823 3540a3d mpr: Fix some spec file entries. Modified: trunk/reactos/dll/win32/mpr/mpr.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mpr/mpr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.spec [iso-8859-1] Sun Feb 26 18:07:39 2017 @@ -25,12 +25,12 @@ @ stdcall MultinetGetConnectionPerformanceA(ptr ptr) @ stdcall MultinetGetConnectionPerformanceW(ptr ptr) -@ stdcall MultinetGetErrorTextA(long ptr long) -@ stdcall MultinetGetErrorTextW(long ptr long) +@ stdcall MultinetGetErrorTextA(long long long) +@ stdcall MultinetGetErrorTextW(long long long) @ stdcall NPSAuthenticationDialogA(ptr) @ stdcall NPSCopyStringA(str ptr ptr) @ stdcall NPSDeviceGetNumberA(str ptr ptr) -@ stdcall NPSDeviceGetStringA(long long ptr long) +@ stdcall NPSDeviceGetStringA(long long ptr ptr) @ stdcall NPSGetProviderHandleA(ptr) @ stdcall NPSGetProviderNameA(long ptr) @ stdcall NPSGetSectionNameA(long ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 18:07:39 2017 @@ -98,7 +98,7 @@ reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.11 reactos/dll/win32/mlang # Synced to WineStaging-1.9.16 reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.23 -reactos/dll/win32/mpr # Synced to WineStaging-1.9.11 +reactos/dll/win32/mpr # Synced to WineStaging-2.2 reactos/dll/win32/mprapi # Synced to WineStaging-1.9.11 reactos/dll/win32/msacm32 # Synced to WineStaging-1.9.23 reactos/dll/win32/msacm32.drv # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73958: [MCIQTZ32] Sync with Wine Staging 2.2. CORE-12823 71fbaba mciqtz32: Implement MCI_DGV_PLAY_REPEAT.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 17:53:31 2017 New Revision: 73958 URL: http://svn.reactos.org/svn/reactos?rev=73958&view=rev Log: [MCIQTZ32] Sync with Wine Staging 2.2. CORE-12823 71fbaba mciqtz32: Implement MCI_DGV_PLAY_REPEAT. Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz.… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] Sun Feb 26 17:53:31 2017 @@ -362,6 +362,18 @@ } } while (hr == S_OK && event_code != EC_COMPLETE); if (hr == S_OK && event_code == EC_COMPLETE) { + /* Repeat the music by seeking and running again */ + if (wma->mci_flags & MCI_DGV_PLAY_REPEAT) { + TRACE("repeat media as requested\n"); + IMediaControl_Stop(wma->pmctrl); + IMediaSeeking_SetPositions(wma->seek, + &wma->seek_start, + AM_SEEKING_AbsolutePositioning, + &wma->seek_stop, + AM_SEEKING_AbsolutePositioning); + IMediaControl_Run(wma->pmctrl); + continue; + } old = InterlockedExchangePointer(&wma->callback, NULL); if (old) mciDriverNotify(old, wma->notify_devid, MCI_NOTIFY_SUCCESSFUL); @@ -390,9 +402,8 @@ { WINE_MCIQTZ* wma; HRESULT hr; - REFERENCE_TIME time1 = 0, time2 = 0; GUID format; - DWORD pos1; + DWORD start_flags; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -411,23 +422,29 @@ mciDriverNotify(old, wma->notify_devid, MCI_NOTIFY_ABORTED); } + wma->mci_flags = dwFlags; IMediaSeeking_GetTimeFormat(wma->seek, &format); if (dwFlags & MCI_FROM) { if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) - time1 = lpParms->dwFrom * 10000; + wma->seek_start = lpParms->dwFrom * 10000; else - time1 = lpParms->dwFrom; - pos1 = AM_SEEKING_AbsolutePositioning; - } else - pos1 = AM_SEEKING_NoPositioning; + wma->seek_start = lpParms->dwFrom; + start_flags = AM_SEEKING_AbsolutePositioning; + } else { + wma->seek_start = 0; + start_flags = AM_SEEKING_NoPositioning; + } if (dwFlags & MCI_TO) { if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) - time2 = lpParms->dwTo * 10000; + wma->seek_stop = lpParms->dwTo * 10000; else - time2 = lpParms->dwTo; - } else - IMediaSeeking_GetDuration(wma->seek, &time2); - IMediaSeeking_SetPositions(wma->seek, &time1, pos1, &time2, AM_SEEKING_AbsolutePositioning); + wma->seek_stop = lpParms->dwTo; + } else { + wma->seek_stop = 0; + IMediaSeeking_GetDuration(wma->seek, &wma->seek_stop); + } + IMediaSeeking_SetPositions(wma->seek, &wma->seek_start, start_flags, + &wma->seek_stop, AM_SEEKING_AbsolutePositioning); hr = IMediaControl_Run(wma->pmctrl); if (FAILED(hr)) { Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz_… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h [iso-8859-1] Sun Feb 26 17:53:31 2017 @@ -37,6 +37,9 @@ IBasicVideo* vidbasic; IBasicAudio* audio; DWORD time_format; + DWORD mci_flags; + REFERENCE_TIME seek_start; + REFERENCE_TIME seek_stop; UINT command_table; HWND parent; MCIDEVICEID notify_devid; 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] Sun Feb 26 17:53:31 2017 @@ -92,7 +92,7 @@ reactos/dll/win32/mapi32 # Synced to WineStaging-2.2 reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.16 reactos/dll/win32/mcicda # Synced to WineStaging-1.9.16 -reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.9.16 +reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.2 reactos/dll/win32/mciseq # Synced to WineStaging-1.9.11 reactos/dll/win32/mciwave # Synced to WineStaging-1.9.11 reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73957: [LZ32_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 17:48:33 2017 New Revision: 73957 URL: http://svn.reactos.org/svn/reactos?rev=73957&view=rev Log: [LZ32_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/lz32/lzexpand_main.c Modified: trunk/rostests/winetests/lz32/lzexpand_main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/lz32/lzexpand_m… ============================================================================== --- trunk/rostests/winetests/lz32/lzexpand_main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/lz32/lzexpand_main.c [iso-8859-1] Sun Feb 26 17:48:33 2017 @@ -229,7 +229,6 @@ "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -249,7 +248,6 @@ "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -269,7 +267,6 @@ "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -289,7 +286,6 @@ "LZOpenFileA succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -633,7 +629,6 @@ "LZOpenFileW succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -653,7 +648,6 @@ "LZOpenFileW succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -673,7 +667,6 @@ "LZOpenFileW succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND, @@ -693,7 +686,6 @@ "LZOpenFileW succeeded on nonexistent file\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %d\n", GetLastError()); - todo_wine ok(test.cBytes == 0xA5, "LZOpenFileW set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_FILE_NOT_FOUND,

7 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2017