Ros-diffs June 2016

ros-diffs@reactos.org

17 participants
228 discussions

[akhaldi] 71567: [PSDK] Update msctf.idl. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:36:59 2016 New Revision: 71567 URL: http://svn.reactos.org/svn/reactos?rev=71567&view=rev Log: [PSDK] Update msctf.idl. CORE-11368 Modified: trunk/reactos/sdk/include/psdk/msctf.idl Modified: trunk/reactos/sdk/include/psdk/msctf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/msctf.idl… ============================================================================== --- trunk/reactos/sdk/include/psdk/msctf.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/msctf.idl [iso-8859-1] Sun Jun 5 19:36:59 2016 @@ -97,6 +97,8 @@ interface IEnumTfLanguageProfiles; interface ITfCompositionView; interface ITfKeyEventSink; +interface ITfPersistentPropertyLoaderACP; +interface ITfRangeACP; cpp_quote("#if 0") typedef [uuid(4f5d560f-5ab5-4dde-8c4d-404592857ab0)] UINT_PTR HKL; @@ -348,6 +350,34 @@ HRESULT Restore( [in] TfEditCookie cookie, [in] ITfRange *range); +} + +[ + object, + uuid(aa80e901-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITextStoreACPServices : IUnknown +{ + HRESULT Serialize( + [in] ITfProperty *prop, + [in] ITfRange *range, + [out] TF_PERSISTENT_PROPERTY_HEADER_ACP *header, + [in] IStream *stream); + + HRESULT Unserialize( + [in] ITfProperty *prop, + [in] const TF_PERSISTENT_PROPERTY_HEADER_ACP *header, + [in] IStream *stream, + [in] ITfPersistentPropertyLoaderACP *loader); + + HRESULT ForceLoadProperty( + [in] ITfProperty *prop); + + HRESULT CreateRange( + [in] LONG start, + [in] LONG end, + [out] ITfRangeACP **range); } [ @@ -1815,3 +1845,19 @@ HRESULT UnadviseMouseSink([in] DWORD dwCookie); } + +[ + object, + local, + uuid(a615096f-1c57-4813-8a15-55ee6e5a839c), + pointer_default(unique) +] +interface ITfTransitoryExtensionSink : IUnknown +{ + HRESULT OnTransitoryExtensionUpdated( + [in] ITfContext *pic, + [in] TfEditCookie ecReadOnly, + [in] ITfRange *pResultRange, + [in] ITfRange *pCompositionRange, + [out] BOOL *pfDeleteResultRange); +}

1 0

[akhaldi] 71566: [MPR_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:35:47 2016 New Revision: 71566 URL: http://svn.reactos.org/svn/reactos?rev=71566&view=rev Log: [MPR_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/mpr/mpr.c Modified: trunk/rostests/winetests/mpr/mpr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mpr/mpr.c?rev=7… ============================================================================== --- trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] Sun Jun 5 19:35:47 2016 @@ -101,25 +101,23 @@ info_size = sizeof(buffer); ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &info_size); - todo_wine{ - if(drive_type == DRIVE_REMOTE) + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); fail_size = 0; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); - todo_wine{ - if(drive_type == DRIVE_REMOTE) + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, NULL); todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); @@ -127,13 +125,13 @@ ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, NULL, &info_size); - todo_wine{ if(((GetVersion() & 0x8000ffff) == 0x00000004) || /* NT40 */ (drive_type == DRIVE_REMOTE)) + todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, - "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); } + "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); fail_size = sizeof(driveA) / sizeof(char) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, @@ -149,13 +147,13 @@ info_size = sizeof(buffer); ret = WNetGetUniversalNameW(driveW, REMOTE_NAME_INFO_LEVEL, buffer, &info_size); - - if(drive_type == DRIVE_REMOTE) - todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); + todo_wine{ + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); - + } ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); } }

1 0

[akhaldi] 71565: [MPR] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:35:09 2016 New Revision: 71565 URL: http://svn.reactos.org/svn/reactos?rev=71565&view=rev Log: [MPR] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/mpr/wnet.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Sun Jun 5 19:35:09 2016 @@ -2101,7 +2101,7 @@ break; } case REMOTE_NAME_INFO_LEVEL: - err = WN_NO_NETWORK; + err = WN_NOT_CONNECTED; break; default: @@ -2148,7 +2148,7 @@ break; } case REMOTE_NAME_INFO_LEVEL: - err = WN_NOT_CONNECTED; + err = WN_NO_NETWORK; break; default: 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 Jun 5 19:35:09 2016 @@ -100,7 +100,7 @@ reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.11 reactos/dll/win32/mlang # Synced to WineStaging-1.9.4 reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/mpr # Synced to WineStaging-1.9.4 +reactos/dll/win32/mpr # Synced to WineStaging-1.9.11 reactos/dll/win32/mprapi # Synced to WineStaging-1.9.4 reactos/dll/win32/msacm32 # Synced to WineStaging-1.9.4 reactos/dll/win32/msacm32.drv # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71564: [MMDEVAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:34:02 2016 New Revision: 71564 URL: http://svn.reactos.org/svn/reactos?rev=71564&view=rev Log: [MMDEVAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/mmdevapi/propstore.c trunk/rostests/winetests/mmdevapi/render.c Modified: trunk/rostests/winetests/mmdevapi/propstore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/propst… ============================================================================== --- trunk/rostests/winetests/mmdevapi/propstore.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mmdevapi/propstore.c [iso-8859-1] Sun Jun 5 19:34:02 2016 @@ -173,7 +173,7 @@ /* Note: the registry key exists even without calling IPropStore::Commit */ size = sizeof(regval); - ret = RegGetValueW(props, NULL, bogusW, RRF_RT_DWORD, &type, &regval, &size); + ret = RegQueryValueExW(props, bogusW, NULL, &type, (LPBYTE)&regval, &size); ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %u\n", ret); ok(type == REG_DWORD, "Got wrong value type: %u\n", type); ok(regval == 0xAB, "Got wrong value: 0x%x\n", regval); Modified: trunk/rostests/winetests/mmdevapi/render.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/render… ============================================================================== --- trunk/rostests/winetests/mmdevapi/render.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mmdevapi/render.c [iso-8859-1] Sun Jun 5 19:34:02 2016 @@ -29,16 +29,14 @@ #define COBJMACROS -#ifdef STANDALONE -#include "initguid.h" -#endif - #include "unknwn.h" #include "uuids.h" #include "mmdeviceapi.h" #include "mmsystem.h" #include "audioclient.h" #include "audiopolicy.h" +#include "initguid.h" +#include "endpointvolume.h" static const unsigned int win_formats[][4] = { { 8000, 8, 1}, { 8000, 8, 2}, { 8000, 16, 1}, { 8000, 16, 2}, @@ -729,7 +727,7 @@ ok(defp == 100000 || broken(defp == 101587) || defp == 200000, "Expected 10ms default period: %u\n", (ULONG)defp); ok(minp != 0, "Minimum period is 0\n"); - ok(minp <= defp, "Mininum period is greater than default period\n"); + ok(minp <= defp, "Minimum period is greater than default period\n"); hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); ok(hr == S_OK, "GetService failed: %08x\n", hr); @@ -951,8 +949,9 @@ ok(gbsize == bufsize, "BufferSize %u at rate %u\n", gbsize, pwfx->nSamplesPerSec); else - ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, - "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); + todo_wine + ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, + "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); /* In shared mode, GetCurrentPadding decreases in multiples of * fragment size (i.e. updated only at period ticks), whereas @@ -2242,6 +2241,44 @@ } +static void test_endpointvolume(void) +{ + HRESULT hr; + IAudioEndpointVolume *aev; + float mindb, maxdb, increment, volume; + BOOL mute; + + hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, + CLSCTX_INPROC_SERVER, NULL, (void**)&aev); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, NULL, NULL); + ok(hr == E_POINTER, "GetVolumeRange should have failed with E_POINTER: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, &maxdb, &increment); + ok(hr == S_OK, "GetVolumeRange failed: 0x%08x\n", hr); + trace("got range: [%f,%f]/%f\n", mindb, maxdb, increment); + + hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, mindb - increment, NULL); + ok(hr == E_INVALIDARG, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetMasterVolumeLevel(aev, &volume); + ok(hr == S_OK, "GetMasterVolumeLevel failed: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, volume, NULL); + ok(hr == S_OK, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetMute(aev, &mute); + ok(hr == S_OK, "GetMute failed: %08x\n", hr); + + hr = IAudioEndpointVolume_SetMute(aev, mute, NULL); + ok(hr == S_OK || hr == S_FALSE, "SetMute failed: %08x\n", hr); + + IAudioEndpointVolume_Release(aev); +} + START_TEST(render) { HRESULT hr; @@ -2283,6 +2320,7 @@ test_volume_dependence(); test_session_creation(); test_worst_case(); + test_endpointvolume(); IMMDevice_Release(dev);

1 0

[akhaldi] 71563: [MMDEVAPI] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:33:06 2016 New Revision: 71563 URL: http://svn.reactos.org/svn/reactos?rev=71563&view=rev Log: [MMDEVAPI] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/mmdevapi/audiovolume.c trunk/reactos/dll/win32/mmdevapi/devenum.c trunk/reactos/dll/win32/mmdevapi/main.c trunk/reactos/dll/win32/mmdevapi/mmdevapi.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mmdevapi/audiovolume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/audiovo… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/audiovolume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/audiovolume.c [iso-8859-1] Sun Jun 5 19:33:06 2016 @@ -21,7 +21,7 @@ typedef struct AEVImpl { IAudioEndpointVolumeEx IAudioEndpointVolumeEx_iface; LONG ref; - float level; + float master_vol; BOOL mute; } AEVImpl; @@ -102,9 +102,12 @@ { AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); - FIXME("(%p)->(%f,%s): stub\n", iface, leveldb, debugstr_guid(ctx)); - - This->level = leveldb; + TRACE("(%p)->(%f,%s)\n", iface, leveldb, debugstr_guid(ctx)); + + if(leveldb < -100.f || leveldb > 0.f) + return E_INVALIDARG; + + This->master_vol = leveldb; return S_OK; } @@ -120,12 +123,12 @@ { AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); - FIXME("(%p)->(%p): stub\n", iface, leveldb); + TRACE("(%p)->(%p)\n", iface, leveldb); if (!leveldb) return E_POINTER; - *leveldb = This->level; + *leveldb = This->master_vol; return S_OK; } @@ -174,19 +177,22 @@ static HRESULT WINAPI AEV_SetMute(IAudioEndpointVolumeEx *iface, BOOL mute, const GUID *ctx) { AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); - - FIXME("(%p)->(%u,%s): stub\n", iface, mute, debugstr_guid(ctx)); + HRESULT ret; + + TRACE("(%p)->(%u,%s)\n", iface, mute, debugstr_guid(ctx)); + + ret = This->mute == mute ? S_FALSE : S_OK; This->mute = mute; - return S_OK; + return ret; } static HRESULT WINAPI AEV_GetMute(IAudioEndpointVolumeEx *iface, BOOL *mute) { AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); - FIXME("(%p)->(%p): stub\n", iface, mute); + TRACE("(%p)->(%p)\n", iface, mute); if (!mute) return E_POINTER; @@ -230,14 +236,14 @@ static HRESULT WINAPI AEV_GetVolumeRange(IAudioEndpointVolumeEx *iface, float *mindb, float *maxdb, float *inc) { - FIXME("(%p)->(%p,%p,%p): stub\n", iface, mindb, maxdb, inc); + TRACE("(%p)->(%p,%p,%p)\n", iface, mindb, maxdb, inc); if (!mindb || !maxdb || !inc) return E_POINTER; - *mindb = 0.0f; - *maxdb = 1.0f; - *inc = 0.1f; + *mindb = -100.f; + *maxdb = 0.f; + *inc = 1.f; return S_OK; } @@ -276,19 +282,17 @@ AEV_GetVolumeRangeChannel }; -HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) +HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) { AEVImpl *This; *ppv = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IAudioEndpointVolumeEx_iface.lpVtbl = &AEVImpl_Vtbl; This->ref = 1; - This->level = 1.0f; - This->mute = FALSE; - - *ppv = (IAudioEndpointVolume*)&This->IAudioEndpointVolumeEx_iface; - return S_OK; -} + + *ppv = &This->IAudioEndpointVolumeEx_iface; + return S_OK; +} Modified: trunk/reactos/dll/win32/mmdevapi/devenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/devenum… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] Sun Jun 5 19:33:06 2016 @@ -577,8 +577,9 @@ if (IsEqualIID(riid, &IID_IAudioClient)){ hr = drvs.pGetAudioEndpoint(&This->devguid, iface, (IAudioClient**)ppv); - }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume)) - hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolume**)ppv); + }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume) || + IsEqualIID(riid, &IID_IAudioEndpointVolumeEx)) + hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolumeEx**)ppv); else if (IsEqualIID(riid, &IID_IAudioSessionManager) || IsEqualIID(riid, &IID_IAudioSessionManager2)) { Modified: trunk/reactos/dll/win32/mmdevapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/main.c?… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/main.c [iso-8859-1] Sun Jun 5 19:33:06 2016 @@ -277,7 +277,6 @@ *ppv = &MMDEVAPI_CF[i]; return S_OK; } - i++; } WARN("(%s, %s, %p): no class found.\n", debugstr_guid(rclsid), Modified: trunk/reactos/dll/win32/mmdevapi/mmdevapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/mmdevap… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/mmdevapi.h [iso-8859-1] Sun Jun 5 19:33:06 2016 @@ -99,7 +99,7 @@ } MMDevice; extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN; -extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) DECLSPEC_HIDDEN; +extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; 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 Jun 5 19:33:06 2016 @@ -99,7 +99,7 @@ reactos/dll/win32/mciwave # Synced to WineStaging-1.9.4 reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.11 reactos/dll/win32/mlang # Synced to WineStaging-1.9.4 -reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.4 +reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.11 reactos/dll/win32/mpr # Synced to WineStaging-1.9.4 reactos/dll/win32/mprapi # Synced to WineStaging-1.9.4 reactos/dll/win32/msacm32 # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71562: [MGMTAPI] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:32:00 2016 New Revision: 71562 URL: http://svn.reactos.org/svn/reactos?rev=71562&view=rev Log: [MGMTAPI] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/mgmtapi/mgmtapi.c trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mgmtapi/mgmtapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mgmtapi/mgmtapi.… ============================================================================== --- trunk/reactos/dll/win32/mgmtapi/mgmtapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mgmtapi/mgmtapi.c [iso-8859-1] Sun Jun 5 19:32:00 2016 @@ -38,3 +38,10 @@ } return TRUE; } + +BOOL WINAPI SnmpMgrTrapListen(HANDLE *available) +{ + FIXME("stub: %p\n", available); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} Modified: trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mgmtapi/mgmtapi.… ============================================================================== --- trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec [iso-8859-1] Sun Jun 5 19:32:00 2016 @@ -6,4 +6,4 @@ @ stub SnmpMgrOpen @ stub SnmpMgrRequest @ stub SnmpMgrStrToOid -@ stub SnmpMgrTrapListen +@ stdcall SnmpMgrTrapListen(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 Jun 5 19:32:00 2016 @@ -97,7 +97,7 @@ reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mciseq # Synced to WineStaging-1.9.4 reactos/dll/win32/mciwave # Synced to WineStaging-1.9.4 -reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.4 +reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.11 reactos/dll/win32/mlang # Synced to WineStaging-1.9.4 reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.4 reactos/dll/win32/mpr # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71561: [MCIQTZ32] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:30:31 2016 New Revision: 71561 URL: http://svn.reactos.org/svn/reactos?rev=71561&view=rev Log: [MCIQTZ32] Sync with Wine Staging 1.9.11. CORE-11368 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 Jun 5 19:30:31 2016 @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mciqtz); -static DWORD CALLBACK MCIQTZ_taskThread(LPVOID arg); +static DWORD MCIQTZ_mciClose(UINT, DWORD, LPMCI_GENERIC_PARMS); static DWORD MCIQTZ_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); /*======================================================================* @@ -70,40 +70,6 @@ return wma; } -/*************************************************************************** - * MCIQTZ_relayTaskMessage [internal] - */ -static LRESULT MCIQTZ_relayTaskMessage(DWORD_PTR dwDevID, UINT wMsg, - DWORD dwFlags, LPARAM lpParms) -{ - WINE_MCIQTZ *wma; - LRESULT res; - HANDLE handles[2]; - DWORD ret; - TRACE("(%08lX, %08x, %08x, %08lx)\n", dwDevID, wMsg, dwFlags, lpParms); - - wma = MCIQTZ_mciGetOpenDev(dwDevID); - if (!wma) - return MCIERR_INVALID_DEVICE_ID; - EnterCriticalSection(&wma->cs); - wma->task.devid = dwDevID; - wma->task.msg = wMsg; - wma->task.flags = dwFlags; - wma->task.parms = lpParms; - SetEvent(wma->task.notify); - handles[0] = wma->task.done; - handles[1] = wma->task.thread; - ret = WaitForMultipleObjects(sizeof(handles)/sizeof(handles[0]), handles, - FALSE, INFINITE); - if (ret == WAIT_OBJECT_0) - res = wma->task.res; - else - res = MCIERR_INTERNAL; - LeaveCriticalSection(&wma->cs); - - return res; -} - /************************************************************************** * MCIQTZ_drvOpen [internal] */ @@ -123,25 +89,12 @@ return 0; wma->stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); - wma->task.notify = CreateEventW(NULL, FALSE, FALSE, NULL); - if (!wma->task.notify) goto err; - wma->task.done = CreateEventW(NULL, FALSE, FALSE, NULL); - if (!wma->task.done) goto err; - wma->task.thread = CreateThread(NULL, 0, MCIQTZ_taskThread, &wma->task, 0, NULL); - if (!wma->task.thread) goto err; - InitializeCriticalSection(&wma->cs); - wma->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCIQTZ"); modp->wType = MCI_DEVTYPE_DIGITAL_VIDEO; wma->wDevID = modp->wDeviceID; modp->wCustomCommandTable = wma->command_table = mciLoadCommandResource(MCIQTZ_hInstance, mciAviWStr, 0); mciSetDriverData(wma->wDevID, (DWORD_PTR)wma); return modp->wDeviceID; -err: - if (wma->task.notify) CloseHandle(wma->task.notify); - if (wma->task.done) CloseHandle(wma->task.done); - HeapFree(GetProcessHeap(), 0, wma); - return 0; } /************************************************************************** @@ -157,16 +110,9 @@ if (wma) { /* finish all outstanding things */ - MCIQTZ_relayTaskMessage(dwDevID, MCI_CLOSE_DRIVER, MCI_WAIT, 0); + MCIQTZ_mciClose(dwDevID, MCI_WAIT, NULL); mciFreeCommandResource(wma->command_table); - MCIQTZ_relayTaskMessage(dwDevID, MCI_CLOSE, MCI_WAIT, 0); - WaitForSingleObject(wma->task.thread, INFINITE); - CloseHandle(wma->task.notify); - CloseHandle(wma->task.done); - CloseHandle(wma->task.thread); - wma->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&wma->cs); mciSetDriverData(dwDevID, 0); CloseHandle(wma->stop_event); HeapFree(GetProcessHeap(), 0, wma); @@ -222,6 +168,9 @@ RECT rc = { 0, 0, 0, 0 }; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); + + if(!lpOpenParms) + return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) @@ -446,6 +395,9 @@ TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + if(!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -503,6 +455,9 @@ TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + if(!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -587,6 +542,29 @@ } /*************************************************************************** + * MCIQTZ_mciResume [internal] + */ +static DWORD MCIQTZ_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + HRESULT hr; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + hr = IMediaControl_Run(wma->pmctrl); + if (FAILED(hr)) { + TRACE("Cannot run filtergraph (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + return 0; +} + +/*************************************************************************** * MCIQTZ_mciGetDevCaps [internal] */ static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) @@ -594,6 +572,9 @@ WINE_MCIQTZ* wma; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if(!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) @@ -690,6 +671,9 @@ WINE_MCIQTZ* wma; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if(!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) @@ -744,6 +728,9 @@ DWORD ret = MCI_INTEGER_RETURNED; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if(!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) @@ -845,6 +832,9 @@ TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + if(!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -906,6 +896,9 @@ WINE_MCIQTZ *wma = MCIQTZ_mciGetOpenDev(wDevID); TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if(!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -951,6 +944,9 @@ TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + if(!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -996,6 +992,9 @@ DWORD res = 0; TRACE("%04x, %08x, %p\n", wDevID, dwFlags, lpParms); + + if(!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) @@ -1058,6 +1057,9 @@ TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); + if(!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; @@ -1096,79 +1098,6 @@ return ret; } -/*************************************************************************** - * MCIQTZ_taskThread [internal] - */ -static DWORD CALLBACK MCIQTZ_taskThread(LPVOID arg) -{ - WINE_MCIQTZ_TASK *task = (WINE_MCIQTZ_TASK *)arg; - - for (;;) { - DWORD ret = WaitForSingleObject(task->notify, INFINITE); - if (ret != WAIT_OBJECT_0) { - TRACE("Got error (%u)\n", ret); - continue; - } - - switch (task->msg) { - case MCI_OPEN_DRIVER: - task->res = MCIQTZ_mciOpen(task->devid, task->flags, (LPMCI_DGV_OPEN_PARMSW)task->parms); - break; - case MCI_CLOSE_DRIVER: - task->res = MCIQTZ_mciClose(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); - break; - case MCI_PLAY: - task->res = MCIQTZ_mciPlay(task->devid, task->flags, (LPMCI_PLAY_PARMS)task->parms); - break; - case MCI_SEEK: - task->res = MCIQTZ_mciSeek(task->devid, task->flags, (LPMCI_SEEK_PARMS)task->parms); - break; - case MCI_STOP: - task->res = MCIQTZ_mciStop(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); - break; - case MCI_PAUSE: - task->res = MCIQTZ_mciPause(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); - break; - case MCI_GETDEVCAPS: - task->res = MCIQTZ_mciGetDevCaps(task->devid, task->flags, (LPMCI_GETDEVCAPS_PARMS)task->parms); - break; - case MCI_SET: - task->res = MCIQTZ_mciSet(task->devid, task->flags, (LPMCI_DGV_SET_PARMS)task->parms); - break; - case MCI_STATUS: - task->res = MCIQTZ_mciStatus(task->devid, task->flags, (LPMCI_DGV_STATUS_PARMSW)task->parms); - break; - case MCI_WHERE: - task->res = MCIQTZ_mciWhere(task->devid, task->flags, (LPMCI_DGV_RECT_PARMS)task->parms); - break; - case MCI_SETAUDIO: - task->res = MCIQTZ_mciSetAudio(task->devid, task->flags, (LPMCI_DGV_SETAUDIO_PARMSW)task->parms); - break; - case MCI_UPDATE: - task->res = MCIQTZ_mciUpdate(task->devid, task->flags, (LPMCI_DGV_UPDATE_PARMS)task->parms); - break; - case MCI_WINDOW: - task->res = MCIQTZ_mciWindow(task->devid, task->flags, (LPMCI_DGV_WINDOW_PARMSW)task->parms); - break; - case MCI_PUT: - task->res = MCIQTZ_mciPut(task->devid, task->flags, (MCI_GENERIC_PARMS*)task->parms); - break; - case MCI_CLOSE: - /* Special internal message */ - SetEvent(task->done); - goto end; - default: - FIXME("Shouldn't receive another message (%04x)\n", task->msg); - task->res = MCIERR_UNRECOGNIZED_COMMAND; - break; - } - SetEvent(task->done); - } - -end: - return 0; -} - /*======================================================================* * MCI QTZ entry points * *======================================================================*/ @@ -1200,28 +1129,26 @@ return 1; switch (wMsg) { - case MCI_OPEN_DRIVER: - case MCI_PLAY: - case MCI_SEEK: - case MCI_GETDEVCAPS: - case MCI_SET: - case MCI_STATUS: - case MCI_WHERE: - if (!dwParam2) return MCIERR_NULL_PARAMETER_BLOCK; - return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); - case MCI_CLOSE_DRIVER: - case MCI_STOP: - case MCI_PAUSE: - return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); + case MCI_OPEN_DRIVER: return MCIQTZ_mciOpen (dwDevID, dwParam1, (LPMCI_DGV_OPEN_PARMSW) dwParam2); + case MCI_CLOSE_DRIVER: return MCIQTZ_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); + case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); + case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); + case MCI_STOP: return MCIQTZ_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); + case MCI_PAUSE: return MCIQTZ_mciPause (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); + case MCI_RESUME: return MCIQTZ_mciResume (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); + case MCI_GETDEVCAPS: return MCIQTZ_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS) dwParam2); + case MCI_SET: return MCIQTZ_mciSet (dwDevID, dwParam1, (LPMCI_DGV_SET_PARMS) dwParam2); + case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); + case MCI_WHERE: return MCIQTZ_mciWhere (dwDevID, dwParam1, (LPMCI_DGV_RECT_PARMS) dwParam2); /* Digital Video specific */ - case MCI_SETAUDIO: + case MCI_SETAUDIO: return MCIQTZ_mciSetAudio (dwDevID, dwParam1, (LPMCI_DGV_SETAUDIO_PARMSW) dwParam2); case MCI_UPDATE: + return MCIQTZ_mciUpdate(dwDevID, dwParam1, (LPMCI_DGV_UPDATE_PARMS)dwParam2); case MCI_WINDOW: + return MCIQTZ_mciWindow(dwDevID, dwParam1, (LPMCI_DGV_WINDOW_PARMSW)dwParam2); case MCI_PUT: - if (!dwParam2) return MCIERR_NULL_PARAMETER_BLOCK; - return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); + return MCIQTZ_mciPut(dwDevID, dwParam1, (MCI_GENERIC_PARMS*)dwParam2); case MCI_RECORD: - case MCI_RESUME: case MCI_INFO: case MCI_LOAD: case MCI_SAVE: 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 Jun 5 19:30:31 2016 @@ -26,17 +26,6 @@ #include <dshow.h> typedef struct { - HANDLE thread; - HANDLE notify; - HANDLE done; - DWORD msg; - DWORD_PTR devid; - DWORD flags; - DWORD_PTR parms; - LRESULT res; -} WINE_MCIQTZ_TASK; - -typedef struct { MCIDEVICEID wDevID; BOOL opened; BOOL uninit; @@ -54,8 +43,6 @@ HANDLE callback; HANDLE thread; HANDLE stop_event; - CRITICAL_SECTION cs; - WINE_MCIQTZ_TASK task; } WINE_MCIQTZ; #endif /* __WINE_PRIVATE_MCIQTZ_H */ 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 Jun 5 19:30:31 2016 @@ -94,7 +94,7 @@ reactos/dll/win32/mapi32 # Synced to WineStaging-1.9.4 reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mcicda # Synced to WineStaging-1.9.4 -reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.9.4 +reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mciseq # Synced to WineStaging-1.9.4 reactos/dll/win32/mciwave # Synced to WineStaging-1.9.4 reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71560: [MCIAVI32] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:29:11 2016 New Revision: 71560 URL: http://svn.reactos.org/svn/reactos?rev=71560&view=rev Log: [MCIAVI32] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mmoutpu… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] Sun Jun 5 19:29:11 2016 @@ -226,14 +226,16 @@ alb->numAudioBlocks, mmck->cksize); if (wma->lpWaveFormat) { if (alb->numAudioBlocks >= alb->numAudioAllocated) { - alb->numAudioAllocated += 32; - if (!wma->lpAudioIndex) - wma->lpAudioIndex = HeapAlloc(GetProcessHeap(), 0, - alb->numAudioAllocated * sizeof(struct MMIOPos)); - else - wma->lpAudioIndex = HeapReAlloc(GetProcessHeap(), 0, wma->lpAudioIndex, - alb->numAudioAllocated * sizeof(struct MMIOPos)); - if (!wma->lpAudioIndex) return FALSE; + DWORD newsize = alb->numAudioAllocated + 32; + struct MMIOPos* newindex; + + if (!wma->lpAudioIndex) + newindex = HeapAlloc(GetProcessHeap(), 0, newsize * sizeof(struct MMIOPos)); + else + newindex = HeapReAlloc(GetProcessHeap(), 0, wma->lpAudioIndex, newsize * sizeof(struct MMIOPos)); + if (!newindex) return FALSE; + alb->numAudioAllocated = newsize; + wma->lpAudioIndex = newindex; } wma->lpAudioIndex[alb->numAudioBlocks].dwOffset = mmck->dwDataOffset; wma->lpAudioIndex[alb->numAudioBlocks].dwSize = mmck->cksize; 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 Jun 5 19:29:11 2016 @@ -92,7 +92,7 @@ reactos/dll/win32/localui # Synced to WineStaging-1.9.4 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.4 reactos/dll/win32/mapi32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.4 +reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mcicda # Synced to WineStaging-1.9.4 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.9.4 reactos/dll/win32/mciseq # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71559: [JSPROXY] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:27:31 2016 New Revision: 71559 URL: http://svn.reactos.org/svn/reactos?rev=71559&view=rev Log: [JSPROXY] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/jsproxy/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/jsproxy/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jsproxy/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/jsproxy/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jsproxy/main.c [iso-8859-1] Sun Jun 5 19:27:31 2016 @@ -99,7 +99,7 @@ return HeapFree( GetProcessHeap(), 0, mem ); } -static inline WCHAR *strdupAW( const char *src, DWORD len ) +static inline WCHAR *strdupAW( const char *src, int len ) { WCHAR *dst = NULL; if (src) @@ -188,14 +188,28 @@ EnterCriticalSection( &cs_jsproxy ); - if (global_script->text) - { - LeaveCriticalSection( &cs_jsproxy ); - return FALSE; - } - if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer && - (global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; - else if ((global_script->text = load_script( tmpfile ))) ret = TRUE; + if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer) + { + DWORD i, len = 0; + for (i = 0; i < buffer->dwScriptBufferSize; i++) + { + if (!buffer->lpszScriptBuffer[i]) break; + len++; + } + if (len == buffer->dwScriptBufferSize) + { + SetLastError( ERROR_INVALID_PARAMETER ); + LeaveCriticalSection( &cs_jsproxy ); + return FALSE; + } + heap_free( global_script->text ); + if ((global_script->text = strdupAW( buffer->lpszScriptBuffer, len ))) ret = TRUE; + } + else + { + heap_free( global_script->text ); + if ((global_script->text = load_script( tmpfile ))) ret = TRUE; + } LeaveCriticalSection( &cs_jsproxy ); return ret; @@ -627,9 +641,18 @@ EnterCriticalSection( &cs_jsproxy ); - if (!global_script->text) goto done; - if (!(urlW = strdupAW( url, len_url ))) goto done; - if (hostname && !(hostnameW = strdupAW( hostname, len_hostname ))) goto done; + if (!global_script->text) + { + SetLastError( ERROR_CAN_NOT_COMPLETE ); + goto done; + } + if (hostname && len_hostname < strlen( hostname )) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + goto done; + } + if (!(urlW = strdupAW( url, -1 ))) goto done; + if (hostname && !(hostnameW = strdupAW( hostname, -1 ))) goto done; TRACE( "%s\n", debugstr_w(global_script->text) ); ret = run_script( global_script->text, urlW, hostnameW, proxy, len_proxy ); 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 Jun 5 19:27:31 2016 @@ -86,7 +86,7 @@ reactos/dll/win32/itircl # Synced to WineStaging-1.9.4 reactos/dll/win32/itss # Synced to WineStaging-1.9.4 reactos/dll/win32/jscript # Synced to WineStaging-1.9.11 -reactos/dll/win32/jsproxy # Synced to WineStaging-1.9.4 +reactos/dll/win32/jsproxy # Synced to WineStaging-1.9.11 reactos/dll/win32/loadperf # Synced to WineStaging-1.9.4 reactos/dll/win32/localspl # Synced to WineStaging-1.9.4 reactos/dll/win32/localui # Synced to WineStaging-1.9.4

1 0

[akhaldi] 71558: [JSCRIPT_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 05 Jun '16

05 Jun '16

Author: akhaldi Date: Sun Jun 5 19:26:27 2016 New Revision: 71558 URL: http://svn.reactos.org/svn/reactos?rev=71558&view=rev Log: [JSCRIPT_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/jscript/api.js trunk/rostests/winetests/jscript/lang.js trunk/rostests/winetests/jscript/regexp.js Modified: trunk/rostests/winetests/jscript/api.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/api.js?… ============================================================================== --- trunk/rostests/winetests/jscript/api.js [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/api.js [iso-8859-1] Sun Jun 5 19:26:27 2016 @@ -2098,6 +2098,8 @@ ok(Date.parse("Jan 20 2009 GMT") === 1232409600000, "Date.parse(\"Jan 20 2009 GMT\") = " + Date.parse("Jan 20 2009 GMT")); ok(Date.parse("Jan 20 2009 UTC-0") === 1232409600000, "Date.parse(\"Jan 20 2009 UTC-0\") = " + Date.parse("Jan 20 2009 UTC-0")); ok(Date.parse("Jan 20 2009 UTC+0000") === 1232409600000, "Date.parse(\"Jan 20 2009 UTC+0000\") = " + Date.parse("Jan 20 2009 UTC+0000")); +ok(Date.parse("Jan 20 2009 UTC-1") === 1232413200000, "Date.parse(\"Jan 20 2009 UTC-1\") = " + Date.parse("Jan 20 2009 UTC-1")); +ok(Date.parse("Jan 20 2009 UTC+1") === 1232406000000, "Date.parse(\"Jan 20 2009 UTC+1\") = " + Date.parse("Jan 20 2009 UTC+1")); ok(Date.parse("Ju 13 79 UTC") === 300672000000, "Date.parse(\"Ju 13 79 UTC\") = " + Date.parse("Ju 13 79 UTC")); ok(Date.parse("12Au91 UTC") === 681955200000, "Date.parse(\"12Au91 UTC\") = " + Date.parse("12Au91 UTC")); ok(Date.parse("7/02/17 UTC") === -1656806400000, "Date.parse(\"7/02/17 UTC\") = " + Date.parse("7/02/17 UTC")); @@ -2108,6 +2110,10 @@ ok(Date.parse("23/71/2000 11::32::UTC") === 1010662320000, "Date.parse(\"23/71/2000 11::32::UTC\") = " + Date.parse("23/71/2000 11::32::UTC")); ok(Date.parse("1970/01/01") === Date.parse("01/01/1970"), "Date.parse(\"1970/01/01\") = " + Date.parse("1970/01/01")); ok(Date.parse("71/12/14") === Date.parse("12/14/1971"), "Date.parse(\"71/12/14\") = " + Date.parse("71/12/14")); +ok(Date.parse("Tue, 22 Mar 2016 09:57:55 -0300") === Date.parse("Tue, 22 Mar 2016 09:57:55 GMT-0300"), + "Date.parse(\"Tue, 22 Mar 2016 09:57:55 -0300\") = " + Date.parse("Tue, 22 Mar 2016 09:57:55 -0300")); +ok(Date.parse("Tue, 22 Mar 2016 09:57:55 +0400") === Date.parse("Tue, 22 Mar 2016 09:57:55 UTC+0400"), + "Date.parse(\"Tue, 22 Mar 2016 09:57:55 +0400\") = " + Date.parse("Tue, 22 Mar 2016 09:57:55 +0400")); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI); Modified: trunk/rostests/winetests/jscript/lang.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/lang.js… ============================================================================== --- trunk/rostests/winetests/jscript/lang.js [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/lang.js [iso-8859-1] Sun Jun 5 19:26:27 2016 @@ -194,6 +194,27 @@ testRecFunc(true); ok(testRecFunc.arguments === null, "testRecFunc.arguments = " + testRecFunc.arguments); +function argumentsTest() { + var save = arguments; + with({arguments: 1}) { + ok(arguments === 1, "arguments = " + arguments); + (function() { + ok(argumentsTest.arguments === save, "unexpected argumentsTest.arguments"); + })(); + } + eval('ok(arguments === save, "unexpected arguments");'); + [1,2].sort(function() { + ok(argumentsTest.arguments === save, "unexpected argumentsTest.arguments"); + return 1; + }); +} + +argumentsTest(); + +(function callAsExprTest() { + ok(callAsExprTest.arguments === null, "callAsExprTest.arguments = " + callAsExprTest.arguments); +})(1,2); + tmp = (function() {1;})(); ok(tmp === undefined, "tmp = " + tmp); tmp = eval("1;"); @@ -214,6 +235,58 @@ tmp = (function(){ return testNoRes(), testRes();})(); +var f1, f2; + +ok(funcexpr() == 2, "funcexpr() = " + funcexpr()); + +f1 = function funcexpr() { return 1; } +ok(f1 != funcexpr, "f1 == funcexpr"); +ok(f1() === 1, "f1() = " + f1()); + +f2 = function funcexpr() { return 2; } +ok(f2 != funcexpr, "f2 != funcexpr"); +ok(f2() === 2, "f2() = " + f2()); + +f1 = null; +for(i = 0; i < 3; i++) { + f2 = function funcexpr2() {}; + ok(f1 != f2, "f1 == f2"); + f1 = f2; +} + +f1 = null; +for(i = 0; i < 3; i++) { + f2 = function() {}; + ok(f1 != f2, "f1 == f2"); + f1 = f2; +} + +(function() { + ok(infuncexpr() == 2, "infuncexpr() = " + infuncexpr()); + + f1 = function infuncexpr() { return 1; } + ok(f1 != funcexpr, "f1 == funcexpr"); + ok(f1() === 1, "f1() = " + f1()); + + f2 = function infuncexpr() { return 2; } + ok(f2 != funcexpr, "f2 != funcexpr"); + ok(f2() === 2, "f2() = " + f2()); + + f1 = null; + for(i = 0; i < 3; i++) { + f2 = function infuncexpr2() {}; + ok(f1 != f2, "f1 == f2"); + f1 = f2; + } + + f1 = null; + for(i = 0; i < 3; i++) { + f2 = function() {}; + ok(f1 != f2, "f1 == f2"); + f1 = f2; + } +})(); + var obj1 = new Object(); ok(typeof(obj1) === "object", "typeof(obj1) is not object"); ok(obj1.constructor === Object, "unexpected obj1.constructor"); @@ -388,6 +461,10 @@ /* ok(tmp === 8.75, "2.5*3.5 !== 8.75"); */ ok(tmp > 8.749999 && tmp < 8.750001, "2.5*3.5 !== 8.75"); ok(getVT(tmp) === "VT_R8", "getVT(2.5*3.5) !== VT_R8"); + +tmp = 2*.5; +ok(tmp === 1, "2*.5 !== 1"); +ok(getVT(tmp) == "VT_I4", "getVT(2*.5) !== VT_I4"); tmp = 4/2; ok(tmp === 2, "4/2 !== 2"); Modified: trunk/rostests/winetests/jscript/regexp.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/regexp.… ============================================================================== --- trunk/rostests/winetests/jscript/regexp.js [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/regexp.js [iso-8859-1] Sun Jun 5 19:26:27 2016 @@ -660,4 +660,21 @@ ok(tmp.toString() === "/abc//igm", "(new RegExp(\"abc/\")).toString() = " + tmp.toString()); ok(/abc/.toString(1, false, "3") === "/abc/", "/abc/.toString(1, false, \"3\") = " + /abc/.toString()); +re = /x/; +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); +re = /x/i; +ok(re.ignoreCase === true, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); +re = new RegExp("xxx", "gi"); +ok(re.ignoreCase === true, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === true, "re.global = " + re.global); +re = /x/mg; +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === true, "re.multiline = " + re.multiline); +ok(re.global === true, "re.global = " + re.global); + reportSuccess();

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2016