April 2018 - Wine-devel - list.winehq.org

[PATCH 1/7] schedsvc: Add a thread for monitoring version 1 task files.
by Dmitry Timoshkov 17 Apr '18

17 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/svc_main.c | 73 +++++++++++++++++++++++++++++++++++++++++++++--- loader/wine.inf.in | 1 + 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 8713bdb88a..3de025335c 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -36,6 +36,66 @@ static const WCHAR scheduleW[] = {'S','c','h','e','d','u','l','e',0}; static SERVICE_STATUS_HANDLE schedsvc_handle; static HANDLE done_event; +static DWORD WINAPI tasks_monitor_thread(void *arg) +{ + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + WCHAR path[MAX_PATH]; + HANDLE htasks; + OVERLAPPED ov; + + TRACE("Starting...\n"); + + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, tasksW); + + htasks = CreateFileW(path, FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); + if (htasks == INVALID_HANDLE_VALUE) return -1; + + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + for (;;) + { + struct + { + FILE_NOTIFY_INFORMATION data; + WCHAR name_buffer[MAX_PATH]; + } info; + HANDLE events[2]; + DWORD ret; + + /* the buffer must be DWORD aligned */ + C_ASSERT(!(sizeof(info) & 3)); + + memset(&info, 0, sizeof(info)); + + ret = ReadDirectoryChangesW(htasks, &info, sizeof(info), FALSE, + FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, NULL); + if (!ret) break; + + events[0] = done_event; + events[1] = ov.hEvent; + + ret = WaitForMultipleObjects(2, events, FALSE, INFINITE); + if (ret == WAIT_OBJECT_0) break; + + switch (info.data.Action) + { + default: + FIXME("%s: action %#x not handled\n", debugstr_w(info.data.FileName), info.data.Action); + break; + } + } + + CloseHandle(ov.hEvent); + CloseHandle(htasks); + + TRACE("Finished.\n"); + + return 0; +} + void schedsvc_auto_start(void) { static DWORD start_type; @@ -201,6 +261,9 @@ static void RPC_finish(void) void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) { + HANDLE thread; + DWORD tid; + TRACE("starting Task Scheduler Service\n"); schedsvc_handle = RegisterServiceCtrlHandlerW(scheduleW, schedsvc_handler); @@ -210,14 +273,16 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) return; } - done_event = CreateEventW(NULL, TRUE, FALSE, NULL); - schedsvc_update_status(SERVICE_START_PENDING); - if (RPC_init() == RPC_S_OK) + done_event = CreateEventW(NULL, TRUE, FALSE, NULL); + thread = CreateThread(NULL, 0, tasks_monitor_thread, NULL, 0, &tid); + + if (thread && RPC_init() == RPC_S_OK) { schedsvc_update_status(SERVICE_RUNNING); - WaitForSingleObject(done_event, INFINITE); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); RPC_finish(); } diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0df762245a..627c6ef56c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2579,6 +2579,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,help, 10,inf, 10,logs, +10,tasks, 10,temp, 11,catroot, 11,mui, -- 2.16.3

1 0

[PATCH 2/2] advapi32/tests: Add basic tests for BuildSecurityDescriptor.
by Alistair Leslie-Hughes 17 Apr '18

17 Apr '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/tests/security.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6ef6c41..38508f1 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7316,6 +7316,44 @@ static void test_GetExplicitEntriesFromAclW(void) HeapFree(GetProcessHeap(), 0, old_acl); } +static void test_BuildSecurityDescriptorW(void) +{ + SECURITY_DESCRIPTOR old_sd, *new_sd, *rel_sd; + ULONG new_sd_size; + DWORD buf_size; + char buf[1024]; + BOOL success; + DWORD ret; + + InitializeSecurityDescriptor(&old_sd, SECURITY_DESCRIPTOR_REVISION); + + buf_size = sizeof(buf); + rel_sd = (SECURITY_DESCRIPTOR *)buf; + success = MakeSelfRelativeSD(&old_sd, rel_sd, &buf_size); + ok(success, "MakeSelfRelativeSD failed with %u\n", GetLastError()); + + new_sd = NULL; + new_sd_size = 0; + ret = BuildSecurityDescriptorW(NULL, NULL, 0, NULL, 0, NULL, NULL, &new_sd_size, (void **)&new_sd); + ok(ret == ERROR_SUCCESS, "BuildSecurityDescriptor failed with %u\n", ret); + ok(new_sd != NULL, "expected new_sd != NULL\n"); + ok(new_sd->Sbz1 == old_sd.Sbz1, "expected %u got %u\n", new_sd->Sbz1, old_sd.Sbz1); + LocalFree(new_sd); + + new_sd = (void *)0xdeadbeef; + ret = BuildSecurityDescriptorW(NULL, NULL, 0, NULL, 0, NULL, &old_sd, &new_sd_size, (void **)&new_sd); + ok(ret == ERROR_INVALID_SECURITY_DESCR, "expected ERROR_INVALID_SECURITY_DESCR, got %u\n", ret); + ok(new_sd == (void *)0xdeadbeef, "expected new_sd == 0xdeadbeef, got %p\n", new_sd); + + new_sd = NULL; + new_sd_size = 0; + ret = BuildSecurityDescriptorW(NULL, NULL, 0, NULL, 0, NULL, rel_sd, &new_sd_size, (void **)&new_sd); + ok(ret == ERROR_SUCCESS, "BuildSecurityDescriptor failed with %u\n", ret); + ok(new_sd != NULL, "expected new_sd != NULL\n"); + ok(new_sd->Sbz1 == old_sd.Sbz1, "expected %u got %u\n", new_sd->Sbz1, old_sd.Sbz1); + LocalFree(new_sd); +} + START_TEST(security) { init(); @@ -7370,6 +7408,7 @@ START_TEST(security) test_maximum_allowed(); test_token_label(); test_GetExplicitEntriesFromAclW(); + test_BuildSecurityDescriptorW(); /* Must be the last test, modifies process token */ test_token_security_descriptor(); -- 1.9.1

1 0

[PATCH 1/2] advapi32: Implement BuildSecurityDescriptorW.
by Alistair Leslie-Hughes 17 Apr '18

17 Apr '18

From: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/security.c | 218 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 164 insertions(+), 54 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index f081b6b..c03baa7 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -48,6 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes); +static DWORD trustee_to_sid(DWORD nDestinationSidLength, PSID pDestinationSid, PTRUSTEEW pTrustee); typedef struct _ACEFLAG { @@ -1255,16 +1256,122 @@ DWORD WINAPI BuildSecurityDescriptorW( IN ULONG cCountOfAccessEntries, IN PEXPLICIT_ACCESSW pListOfAccessEntries, IN ULONG cCountOfAuditEntries, - IN PEXPLICIT_ACCESSW pListofAuditEntries, + IN PEXPLICIT_ACCESSW pListOfAuditEntries, IN PSECURITY_DESCRIPTOR pOldSD, IN OUT PULONG lpdwBufferLength, OUT PSECURITY_DESCRIPTOR* pNewSD) { - FIXME("(%p,%p,%d,%p,%d,%p,%p,%p,%p) stub!\n",pOwner,pGroup, - cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries, - pListofAuditEntries,pOldSD,lpdwBufferLength,pNewSD); + SECURITY_DESCRIPTOR desc; + NTSTATUS status; + DWORD ret = ERROR_SUCCESS; + + TRACE("(%p,%p,%d,%p,%d,%p,%p,%p,%p)\n", pOwner, pGroup, + cCountOfAccessEntries, pListOfAccessEntries, cCountOfAuditEntries, + pListOfAuditEntries, pOldSD, lpdwBufferLength, pNewSD); - return ERROR_CALL_NOT_IMPLEMENTED; + if (pOldSD) + { + SECURITY_DESCRIPTOR_CONTROL control; + DWORD desc_size, dacl_size = 0, sacl_size = 0, owner_size = 0, group_size = 0; + PACL dacl = NULL, sacl = NULL; + PSID owner = NULL, group = NULL; + DWORD revision; + + if ((status = RtlGetControlSecurityDescriptor( pOldSD, &control, &revision )) != STATUS_SUCCESS) + return RtlNtStatusToDosError( status ); + if (!(control & SE_SELF_RELATIVE)) + return ERROR_INVALID_SECURITY_DESCR; + + desc_size = sizeof(desc); + status = RtlSelfRelativeToAbsoluteSD( pOldSD, &desc, &desc_size, dacl, &dacl_size, sacl, &sacl_size, + owner, &owner_size, group, &group_size ); + if (status == STATUS_BUFFER_TOO_SMALL) + { + if (dacl_size) + dacl = LocalAlloc( LMEM_FIXED, dacl_size ); + if (sacl_size) + sacl = LocalAlloc( LMEM_FIXED, sacl_size ); + if (owner_size) + owner = LocalAlloc( LMEM_FIXED, owner_size ); + if (group_size) + group = LocalAlloc( LMEM_FIXED, group_size ); + + desc_size = sizeof(desc); + status = RtlSelfRelativeToAbsoluteSD( pOldSD, &desc, &desc_size, dacl, &dacl_size, sacl, &sacl_size, + owner, &owner_size, group, &group_size ); + } + if (status != STATUS_SUCCESS) + { + LocalFree( dacl ); + LocalFree( sacl ); + LocalFree( owner ); + LocalFree( group ); + return RtlNtStatusToDosError( status ); + } + } + else + { + if ((status = RtlCreateSecurityDescriptor( &desc, SECURITY_DESCRIPTOR_REVISION )) != STATUS_SUCCESS) + return RtlNtStatusToDosError( status ); + } + + if (pOwner) + { + LocalFree( desc.Owner ); + desc.Owner = LocalAlloc( LMEM_FIXED, sizeof(MAX_SID) ); + if ((ret = trustee_to_sid( sizeof(MAX_SID), desc.Owner, pOwner ))) + goto done; + } + + if (pGroup) + { + LocalFree( desc.Group ); + desc.Group = LocalAlloc( LMEM_FIXED, sizeof(MAX_SID) ); + if ((ret = trustee_to_sid( sizeof(MAX_SID), desc.Group, pGroup ))) + goto done; + } + + if (pListOfAccessEntries) + { + PACL new_dacl; + + if ((ret = SetEntriesInAclW( cCountOfAccessEntries, pListOfAccessEntries, desc.Dacl, &new_dacl ))) + goto done; + + LocalFree( desc.Dacl ); + desc.Dacl = new_dacl; + desc.Control |= SE_DACL_PRESENT; + } + + if (pListOfAuditEntries) + { + PACL new_sacl; + + if ((ret = SetEntriesInAclW( cCountOfAuditEntries, pListOfAuditEntries, desc.Sacl, &new_sacl ))) + goto done; + + LocalFree( desc.Sacl ); + desc.Sacl = new_sacl; + desc.Control |= SE_SACL_PRESENT; + } + + *lpdwBufferLength = RtlLengthSecurityDescriptor( &desc ); + *pNewSD = LocalAlloc( LMEM_FIXED, *lpdwBufferLength ); + + if ((status = RtlMakeSelfRelativeSD( &desc, *pNewSD, lpdwBufferLength )) != STATUS_SUCCESS) + { + ret = RtlNtStatusToDosError( status ); + LocalFree( *pNewSD ); + *pNewSD = NULL; + } + +done: + /* free absolute descriptor */ + LocalFree( desc.Owner ); + LocalFree( desc.Group ); + LocalFree( desc.Sacl ); + LocalFree( desc.Dacl ); + return ret; } /****************************************************************************** @@ -3754,6 +3861,56 @@ static void free_trustee_name(TRUSTEE_FORM form, WCHAR *trustee_nameW) } } +static DWORD trustee_to_sid( DWORD nDestinationSidLength, PSID pDestinationSid, PTRUSTEEW pTrustee ) +{ + if (pTrustee->MultipleTrusteeOperation == TRUSTEE_IS_IMPERSONATE) + { + WARN("bad multiple trustee operation %d\n", pTrustee->MultipleTrusteeOperation); + return ERROR_INVALID_PARAMETER; + } + + switch (pTrustee->TrusteeForm) + { + case TRUSTEE_IS_SID: + if (!CopySid(nDestinationSidLength, pDestinationSid, pTrustee->ptstrName)) + { + WARN("bad sid %p\n", pTrustee->ptstrName); + return ERROR_INVALID_PARAMETER; + } + break; + case TRUSTEE_IS_NAME: + { + DWORD sid_size = nDestinationSidLength; + DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1; + SID_NAME_USE use; + if (!strcmpW( pTrustee->ptstrName, CURRENT_USER )) + { + if (!lookup_user_account_name( pDestinationSid, &sid_size, NULL, &domain_size, &use )) + { + return GetLastError(); + } + } + else if (!LookupAccountNameW(NULL, pTrustee->ptstrName, pDestinationSid, &sid_size, NULL, &domain_size, &use)) + { + WARN("bad user name %s\n", debugstr_w(pTrustee->ptstrName)); + return ERROR_INVALID_PARAMETER; + } + break; + } + case TRUSTEE_IS_OBJECTS_AND_SID: + FIXME("TRUSTEE_IS_OBJECTS_AND_SID unimplemented\n"); + break; + case TRUSTEE_IS_OBJECTS_AND_NAME: + FIXME("TRUSTEE_IS_OBJECTS_AND_NAME unimplemented\n"); + break; + default: + WARN("bad trustee form %d\n", pTrustee->TrusteeForm); + return ERROR_INVALID_PARAMETER; + } + + return ERROR_SUCCESS; +} + /****************************************************************************** * SetEntriesInAclA [ADVAPI32.@] */ @@ -3849,56 +4006,9 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, pEntries[i].Trustee.TrusteeForm, pEntries[i].Trustee.TrusteeType, pEntries[i].Trustee.ptstrName); - if (pEntries[i].Trustee.MultipleTrusteeOperation == TRUSTEE_IS_IMPERSONATE) - { - WARN("bad multiple trustee operation %d for trustee %d\n", pEntries[i].Trustee.MultipleTrusteeOperation, i); - ret = ERROR_INVALID_PARAMETER; - goto exit; - } - - switch (pEntries[i].Trustee.TrusteeForm) - { - case TRUSTEE_IS_SID: - if (!CopySid(FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]), - ppsid[i], pEntries[i].Trustee.ptstrName)) - { - WARN("bad sid %p for trustee %d\n", pEntries[i].Trustee.ptstrName, i); - ret = ERROR_INVALID_PARAMETER; - goto exit; - } - break; - case TRUSTEE_IS_NAME: - { - DWORD sid_size = FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]); - DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1; - SID_NAME_USE use; - if (!strcmpW( pEntries[i].Trustee.ptstrName, CURRENT_USER )) - { - if (!lookup_user_account_name( ppsid[i], &sid_size, NULL, &domain_size, &use )) - { - ret = GetLastError(); - goto exit; - } - } - else if (!LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use)) - { - WARN("bad user name %s for trustee %d\n", debugstr_w(pEntries[i].Trustee.ptstrName), i); - ret = ERROR_INVALID_PARAMETER; - goto exit; - } - break; - } - case TRUSTEE_IS_OBJECTS_AND_SID: - FIXME("TRUSTEE_IS_OBJECTS_AND_SID unimplemented\n"); - break; - case TRUSTEE_IS_OBJECTS_AND_NAME: - FIXME("TRUSTEE_IS_OBJECTS_AND_NAME unimplemented\n"); - break; - default: - WARN("bad trustee form %d for trustee %d\n", pEntries[i].Trustee.TrusteeForm, i); - ret = ERROR_INVALID_PARAMETER; + ret = trustee_to_sid( FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]), ppsid[i], &pEntries[i].Trustee); + if (ret) goto exit; - } /* Note: we overestimate the ACL size here as a tradeoff between * instructions (simplicity) and memory */ -- 1.9.1

1 0

[PATCH v13 1/3] wmp: Add seeking and duration
by Anton Romanov 17 Apr '18

17 Apr '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- Changed test media file that works now consistently across all windows VMs as far as duration goes. Hopefully this'll help different versions of gstreamer as well. Removed all but 60 as accepted duration in tests. dlls/wmp/player.c | 65 +++++++++++++++++++++++++++++++++------- dlls/wmp/tests/media.c | 37 +++++++++++++++++++++++ dlls/wmp/tests/rsrc.rc | 2 +- dlls/wmp/tests/test.mp3 | Bin 240333 -> 240333 bytes dlls/wmp/wmp_private.h | 3 ++ 5 files changed, 96 insertions(+), 11 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index f4ce62a447..8448916a80 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1396,8 +1396,21 @@ static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMembe static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem)); - return E_NOTIMPL; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrItem), pIsAvailable); + if (!This->filter_graph) { + *pIsAvailable = VARIANT_FALSE; + } else if (strcmpW(currentPosition, bstrItem) == 0) { + DWORD capabilities; + IMediaSeeking_GetCapabilities(This->media_seeking, &capabilities); + *pIsAvailable = (capabilities & AM_SEEKING_CanSeekAbsolute) ? + VARIANT_TRUE : VARIANT_FALSE; + } else { + FIXME("%s not implemented\n", debugstr_w(bstrItem)); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI WMPControls_play(IWMPControls *iface) @@ -1428,11 +1441,16 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) if (SUCCEEDED(hres)) hres = IGraphBuilder_RenderFile(This->filter_graph, media->url, NULL); + if (SUCCEEDED(hres)) + update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaControl, (void**)&This->media_control); if (SUCCEEDED(hres)) - update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaSeeking, + (void**)&This->media_seeking); + if (SUCCEEDED(hres)) + hres = IMediaSeeking_SetTimeFormat(This->media_seeking, &TIME_FORMAT_MEDIA_TIME); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaEvent, (void**)&This->media_event); @@ -1459,7 +1477,10 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) } if (SUCCEEDED(hres)) { + LONGLONG duration; update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsPlaying); + if (SUCCEEDED(IMediaSeeking_GetDuration(This->media_seeking, &duration))) + media->duration = (DOUBLE)duration / 10000000.0f; } else { update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsUndefined); } @@ -1482,11 +1503,14 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) if (This->media_event) { IMediaEvent_Release(This->media_event); } - + if (This->media_seeking) { + IMediaSeeking_Release(This->media_seeking); + } IGraphBuilder_Release(This->filter_graph); This->filter_graph = NULL; This->media_control = NULL; This->media_event = NULL; + This->media_seeking = NULL; update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistOpenNoMedia); update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsStopped); @@ -1517,15 +1541,33 @@ static HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) static HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%p)\n", This, pdCurrentPosition); - return E_NOTIMPL; + HRESULT hres; + LONGLONG currentPosition; + + TRACE("(%p)->(%p)\n", This, pdCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + hres = IMediaSeeking_GetCurrentPosition(This->media_seeking, &currentPosition); + *pdCurrentPosition = (DOUBLE) currentPosition / 10000000.0f; + TRACE("hres: %d, pos: %f\n", hres, *pdCurrentPosition); + return hres; } static HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) { + LONGLONG Current; + HRESULT hres; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%f)\n", This, dCurrentPosition); - return E_NOTIMPL; + TRACE("(%p)->(%f)\n", This, dCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + Current = 10000000 * dCurrentPosition; + hres = IMediaSeeking_SetPositions(This->media_seeking, &Current, + AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); + + return hres; } static HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) @@ -1762,9 +1804,12 @@ static HRESULT WINAPI WMPMedia_getMarkerName(IWMPMedia *iface, LONG MarkerNum, B static HRESULT WINAPI WMPMedia_get_duration(IWMPMedia *iface, DOUBLE *pDuration) { + /* MSDN: If this property is used with a media item other than the one + * specified in Player.currentMedia, it may not contain a valid value. */ WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%p)\n", This, pDuration); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pDuration); + *pDuration = This->duration; + return S_OK; } static HRESULT WINAPI WMPMedia_get_durationString(IWMPMedia *iface, BSTR *pbstrDuration) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index c2cd1cf941..f242ac90a5 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -303,6 +303,11 @@ static BOOL test_wmp(void) static DWORD dw = 100; IWMPSettings *settings; BOOL test_ran = TRUE; + DOUBLE duration; + VARIANT_BOOL vbool; + IWMPMedia *media; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + BSTR bstrcurrentPosition = SysAllocString(currentPosition); hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -338,6 +343,10 @@ static BOOL test_wmp(void) ok(hres == S_OK, "get_controls failed: %08x\n", hres); ok(controls != NULL, "controls = NULL\n"); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_FALSE, "unexpected value\n"); + hres = IWMPControls_play(controls); ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); @@ -380,6 +389,33 @@ static BOOL test_wmp(void) /* MediaOpening happens only on xp, 2003 */ CLEAR_CALLED(OPENSTATE, wmposMediaOpening); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_TRUE, "unexpected value\n"); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + ok((int)duration == 0, "unexpected value %f\n", duration); + + duration = 15.0; + hres = IWMPControls_put_currentPosition(controls, duration); + ok(hres == S_OK, "IWMPControls_put_currentPosition failed: %08x\n", hres); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + /* builtin quartz does not handle this currently and resets to 0.0, works + * with native quartz */ + todo_wine ok((int)duration >= 15.0, "unexpected value %f\n", duration); + + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_OK, "IWMPPlayer4_get_currentMedia failed: %08x\n", hres); + hres = IWMPMedia_get_duration(media, &duration); + ok(hres == S_OK, "IWMPMedia_get_duration failed: %08x\n", hres); + ok(round(duration) == 60, "unexpected value: %f\n", duration); + IWMPMedia_Release(media); + SET_EXPECT(PLAYSTATE, wmppsStopped); /* The following happens on wine only since we close media on stop */ SET_EXPECT(OPENSTATE, wmposPlaylistOpenNoMedia); @@ -414,6 +450,7 @@ playback_skip: IOleObject_Release(oleobj); DeleteFileW(filename); SysFreeString(filename); + SysFreeString(bstrcurrentPosition); return test_ran; } diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc index a92079e798..7ce8c4b687 100644 --- a/dlls/wmp/tests/rsrc.rc +++ b/dlls/wmp/tests/rsrc.rc @@ -18,7 +18,7 @@ #include "windef.h" -/* ffmpeg -ar 48000 -t 60 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 output.mp3 */ +/* ffmpeg -f lavfi -i anullsrc=r=48000:cl=4 -t 60 -acodec libmp3lame -aq 4 dlls/wmp/tests/test.mp3 */ /* @makedep: test.mp3 */ test.mp3 RCDATA "test.mp3" /* ffmpeg -ar 48000 -t 1 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 test1s.mp3 */ diff --git a/dlls/wmp/tests/test.mp3 b/dlls/wmp/tests/test.mp3 index 149a2cd346ee52ae179c46198ce290a5dd4d6251..a8f22ce279cda0861cefe6851dcae0bced1372ad 100644 GIT binary patch literal 240333 zcmeIxVWgdP9Ki9X?nXsMMod)NB697zTaCn0m$o+1ZbrsTx%MKf#3W)&WJV%Il2WE6 ziHzBlD@`Oa#*{=N5s5^ataI*ObidzMn|9cX(a)AKk0|L^mh=YM|Z<D4xI%&r*5$8GaF zcFc`lR}I6|wmth7Hr_qGX?A*M{raW57f$ET%`Yy?3(GD07M>cdM$cV)YMA=q?O|%= zHP>Cg>W0-fuDR*vTi4!x$DPwNvv+N}=ibft&po(x`@@gS?|f|6?mbT|?0s_IGtcgS z?)euE9DMPmLx*2}<<-~Uc=N4y-aYdEhaY|X$+6=nK3)9$)R$j<{mtn!XTSaahaZ3X z`IldR`~8nU|N8r%@h6Xle0((I%<=(;wO4N*-y6?y^t0)mOY8qm=g+PFVwhSSu6l2D z?UrHKa9|i#Y`bs!+|n0)bbPRuE?xX-y#Km`+MkdA(a)BJV0{FizErzbrBYZIRT<b>z{ zZo>1oKY!56YyAJpXSoR1`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCF zMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z| z(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3a zk44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W( z`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)I zm5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk z*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb! z!<COk*!j(a)Im5)W(`Ow3ak44z|(8HCFMcDb!!<COk*!j(a)Im5)W(`Ow3ak44z|(8F~F X_;{pC>Wi5FlJ(a)hP+utJWN&EZ(a)Ay;|i literal 240333 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 diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 3792e52abd..e8d534803f 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -42,6 +42,8 @@ typedef struct { LONG ref; WCHAR *url; + + DOUBLE duration; } WMPMedia; struct WindowsMediaPlayer { @@ -76,6 +78,7 @@ struct WindowsMediaPlayer { IGraphBuilder* filter_graph; IMediaControl* media_control; IMediaEvent* media_event; + IMediaSeeking* media_seeking; /* Async event notification */ HWND msg_window; -- 2.17.0

2 1

[PATCH] shell32: Implement SHCreateSessionKey.
by Alistair Leslie-Hughes 17 Apr '18

17 Apr '18

This implementation is based on the Geoff Chappell description. Based off patch by Dmitry Timoshkov. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shellreg.c | 36 +++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellole.c | 23 +++++++++++++++++++---- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index 356ec4e..dafe5a9 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -34,6 +34,7 @@ #include "undocshell.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -148,13 +149,42 @@ HRESULT WINAPI SHRegCloseKey (HKEY hkey) return RegCloseKey( hkey ); } +static const WCHAR session_format[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','e','s','s','i','o','n','I','n','f','o','\\','%','d',0}; + +static BOOL WINAPI create_session_key(INIT_ONCE *once, void *param, void **context) +{ + DWORD session; + HKEY hkey_session; + LPWSTR session_reg_str = param; + + if(!ProcessIdToSessionId( GetCurrentProcessId(), &session)) + return FALSE; + + sprintfW(session_reg_str, session_format, session); + + if (RegCreateKeyExW(HKEY_CURRENT_USER, session_reg_str, 0, NULL, + REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey_session, NULL)) + return FALSE; + + RegCloseKey(hkey_session); + TRACE("session key %s\n", debugstr_w(session_reg_str)); + return TRUE; +} + /************************************************************************* * SHCreateSessionKey [SHELL32.723] * */ HRESULT WINAPI SHCreateSessionKey(REGSAM access, HKEY *hkey) { - FIXME("stub: %d %p\n", access, hkey); - *hkey = NULL; - return E_NOTIMPL; + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + static WCHAR session_reg_str[sizeof(session_format) + 10]; + + InitOnceExecuteOnce(&init_once, create_session_key, session_reg_str, NULL); + + TRACE("Using session key %s\n", debugstr_w(session_reg_str)); + return RegOpenKeyExW(HKEY_CURRENT_USER, session_reg_str, 0, access, hkey); } diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index f611faf..67b8a90 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -862,8 +862,15 @@ static void test_DragQueryFile(void) static void test_SHCreateSessionKey(void) { + static const WCHAR session_format[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','e','s','s','i','o','n','I','n','f','o','\\','%','d',0}; HKEY hkey, hkey2; HRESULT hr; + DWORD session; + WCHAR sessionW[MAX_PATH]; + LONG ret; if (!pSHCreateSessionKey) { @@ -877,17 +884,25 @@ static void test_SHCreateSessionKey(void) hkey = (HKEY)0xdeadbeef; hr = pSHCreateSessionKey(0, &hkey); todo_wine ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); - ok(hkey == NULL, "got %p\n", hkey); + todo_wine ok(hkey == NULL, "got %p\n", hkey); hr = pSHCreateSessionKey(KEY_READ, &hkey); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateSessionKey(KEY_READ, &hkey2); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); RegCloseKey(hkey); RegCloseKey(hkey2); + + /* Check the registery */ + ProcessIdToSessionId( GetCurrentProcessId(), &session); + wsprintfW(sessionW, session_format, session); + + ret = RegOpenKeyW(HKEY_CURRENT_USER, sessionW, &hkey); + ok(!ret, "key not found\n"); + RegCloseKey(hkey); } static void test_dragdrophelper(void) -- 1.9.1

2 1

[PATCH] ntoskrnl: Add FsRtlRegisterFileSystemFilterCallbacks stub
by Alistair Leslie-Hughes 17 Apr '18

17 Apr '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=43484 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 ++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntifs.h | 82 +++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8e6fde2..99f5f92 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3516,3 +3516,12 @@ HANDLE WINAPI PsGetProcessId(PEPROCESS process) return 0; } + +/********************************************************************* + * FsRtlRegisterFileSystemFilterCallbacks (NTOSKRNL.@) + */ +NTSTATUS WINAPI FsRtlRegisterFileSystemFilterCallbacks( DRIVER_OBJECT *object, PFS_FILTER_CALLBACKS callbacks) +{ + FIXME("stub: %p %p\n", object, callbacks); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ce9f93c..0bece17 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -273,7 +273,7 @@ @ stub FsRtlPrepareMdlWriteDev @ stub FsRtlPrivateLock @ stub FsRtlProcessFileLock -@ stub FsRtlRegisterFileSystemFilterCallbacks +@ stdcall FsRtlRegisterFileSystemFilterCallbacks(ptr ptr) @ stdcall FsRtlRegisterUncProvider(ptr ptr long) @ stub FsRtlReleaseFile @ stub FsRtlRemoveLargeMcbEntry diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 8c63d0b..ccd1ba9 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -46,6 +46,88 @@ typedef struct _KQUEUE LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; +typedef enum _FS_FILTER_STREAM_FO_NOTIFICATION_TYPE +{ + NotifyTypeCreate = 0, + NotifyTypeRetired +} FS_FILTER_STREAM_FO_NOTIFICATION_TYPE, *PFS_FILTER_STREAM_FO_NOTIFICATION_TYPE; + +typedef union _FS_FILTER_PARAMETERS +{ + struct + { + PLARGE_INTEGER EndingOffset; + PERESOURCE *ResourceToRelease; + } AcquireForModifiedPageWriter; + + struct + { + PERESOURCE ResourceToRelease; + } ReleaseForModifiedPageWriter; + + struct + { + FS_FILTER_SECTION_SYNC_TYPE SyncType; + ULONG PageProtection; + PFS_FILTER_SECTION_SYNC_OUTPUT OutputInformation; + } AcquireForSectionSynchronization; + + struct + { + FS_FILTER_STREAM_FO_NOTIFICATION_TYPE NotificationType; + BOOLEAN POINTER_ALIGNMENT SafeToRecurse; + } NotifyStreamFileObject; + + struct + { + PIRP Irp; + void *FileInformation; + PULONG Length; + FILE_INFORMATION_CLASS FileInformationClass; + NTSTATUS CompletionStatus; + } QueryOpen; + + struct + { + void *Argument1; + void *Argument2; + void *Argument3; + void *Argument4; + void *Argument5; + } Others; + +} FS_FILTER_PARAMETERS, *PFS_FILTER_PARAMETERS; + +typedef struct _FS_FILTER_CALLBACK_DATA +{ + ULONG SizeOfFsFilterCallbackData; + UCHAR Operation; + UCHAR Reserved; + struct _DEVICE_OBJECT *DeviceObject; + struct _FILE_OBJECT *FileObject; + FS_FILTER_PARAMETERS Parameters; +} FS_FILTER_CALLBACK_DATA, *PFS_FILTER_CALLBACK_DATA; + +typedef NTSTATUS (*PFS_FILTER_CALLBACK)(PFS_FILTER_CALLBACK_DATA, void **); +typedef void (*PFS_FILTER_COMPLETION_CALLBACK)(PFS_FILTER_CALLBACK_DATA, NTSTATUS, void *context); + +typedef struct _FS_FILTER_CALLBACKS +{ + ULONG SizeOfFsFilterCallbacks; + ULONG Reserved; + PFS_FILTER_CALLBACK PreAcquireForSectionSynchronization; + PFS_FILTER_COMPLETION_CALLBACK PostAcquireForSectionSynchronization; + PFS_FILTER_CALLBACK PreReleaseForSectionSynchronization; + PFS_FILTER_COMPLETION_CALLBACK PostReleaseForSectionSynchronization; + PFS_FILTER_CALLBACK PreAcquireForCcFlush; + PFS_FILTER_COMPLETION_CALLBACK PostAcquireForCcFlush; + PFS_FILTER_CALLBACK PreReleaseForCcFlush; + PFS_FILTER_COMPLETION_CALLBACK PostReleaseForCcFlush; + PFS_FILTER_CALLBACK PreAcquireForModifiedPageWriter; + PFS_FILTER_COMPLETION_CALLBACK PostAcquireForModifiedPageWriter; + PFS_FILTER_CALLBACK PreReleaseForModifiedPageWriter; + PFS_FILTER_COMPLETION_CALLBACK PostReleaseForModifiedPageWriter; +} FS_FILTER_CALLBACKS, *PFS_FILTER_CALLBACKS; NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); -- 1.9.1

1 0

[PATCH] wineconsole: When loading settings for an application, respect a 0 in FontSize
by Fabian Maurer 16 Apr '18

16 Apr '18

Fixes bug 44976. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kernel32/tests/console.c | 72 +++++++++++++++++++++++++++++---- programs/wineconsole/registry.c | 13 +++++- 2 files changed, 75 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 926c052686..38ffec868d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3019,6 +3019,66 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } +static void reset_console(HANDLE *hConIn, HANDLE *hConOut) +{ + CloseHandle(*hConIn); + CloseHandle(*hConOut); + FreeConsole(); + ok(AllocConsole(), "Couldn't alloc console\n"); + *hConIn = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + *hConOut = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(*hConIn != INVALID_HANDLE_VALUE, "Opening ConIn\n"); + ok(*hConOut != INVALID_HANDLE_VALUE, "Opening ConOut\n"); +} + +static void set_redirected_console_settings(DWORD font_size) +{ + char path_exe[MAX_PATH]; + HKEY key_console, key_setting; + int i; + + GetModuleFileNameA(NULL, path_exe, MAX_PATH); + for (i = 0; path_exe[i]; i++) + { + if (path_exe[i] == '\\') + path_exe[i] = '_'; + } + + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Console", &key_console)) + { + if (!RegCreateKeyExA(key_console, path_exe, 0, 0, 0, KEY_ALL_ACCESS, 0, &key_setting, 0)) + { + RegSetValueExA(key_setting, "FontSize", 0, REG_DWORD, (BYTE *)&font_size, sizeof(DWORD)); + RegCloseKey(key_setting); + } + RegCloseKey(key_console); + } +} + +static void test_Redirected(HANDLE std_output) +{ + HANDLE std_input_dummy; + CONSOLE_FONT_INFO cfi; + COORD coord; + BOOL ret; + + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + ret = GetCurrentConsoleFont(std_output, FALSE, &cfi); + ok(ret, "got %d, expected non-zero\n", ret); + + set_redirected_console_settings(MAKELONG(42, 43)); + reset_console(&std_input_dummy, &std_output); + coord = GetConsoleFontSize(std_output, cfi.nFont); + ok(coord.X == 42, "Expected 42, got %d\n", coord.X); + ok(coord.Y == 43, "Expected 43, got %d\n", coord.Y); + + set_redirected_console_settings(MAKELONG(0, 0)); + reset_console(&std_input_dummy, &std_output); + coord = GetConsoleFontSize(std_output, cfi.nFont); + ok(coord.X == 8, "Expected 8, got %d\n", coord.X); + ok(coord.Y == 16, "Expected 16, got %d\n", coord.Y); +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -3129,14 +3189,7 @@ START_TEST(console) testWaitForConsoleInput(hConIn); /* clear duplicated console font table */ - CloseHandle(hConIn); - CloseHandle(hConOut); - FreeConsole(); - ok(AllocConsole(), "Couldn't alloc console\n"); - hConIn = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); - hConOut = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); - ok(hConIn != INVALID_HANDLE_VALUE, "Opening ConIn\n"); - ok(hConOut != INVALID_HANDLE_VALUE, "Opening ConOut\n"); + reset_console(&hConIn, &hConOut); testCtrlHandler(); /* still to be done: access rights & access on objects */ @@ -3170,4 +3223,7 @@ START_TEST(console) test_GetConsoleFontInfo(hConOut); test_SetConsoleFont(hConOut); test_GetConsoleScreenBufferInfoEx(hConOut); + + test_Redirected(hConOut); + reset_console(&hConIn, &hConOut); } diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index 080431a5ff..92c53a7ca4 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -126,8 +126,17 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) count = sizeof(val); if (!RegQueryValueExW(hConKey, wszFontSize, 0, &type, (LPBYTE)&val, &count)) { - cfg->cell_height = HIWORD(val); - cfg->cell_width = LOWORD(val); + int height = HIWORD(val); + int width = LOWORD(val); + /* A value of zero reflects the default settings */ + if (height != 0) + { + cfg->cell_height = height; + } + if (width != 0) + { + cfg->cell_width = width; + } } count = sizeof(val); -- 2.17.0

2 1

[PATCH v12 1/3] wmp: Add seeking and duration
by Anton Romanov 16 Apr '18

16 Apr '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/player.c | 65 +++++++++++++++++++++++++++++++++++------- dlls/wmp/tests/media.c | 41 ++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 3 ++ 3 files changed, 99 insertions(+), 10 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index f4ce62a447..8448916a80 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1396,8 +1396,21 @@ static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMembe static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem)); - return E_NOTIMPL; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrItem), pIsAvailable); + if (!This->filter_graph) { + *pIsAvailable = VARIANT_FALSE; + } else if (strcmpW(currentPosition, bstrItem) == 0) { + DWORD capabilities; + IMediaSeeking_GetCapabilities(This->media_seeking, &capabilities); + *pIsAvailable = (capabilities & AM_SEEKING_CanSeekAbsolute) ? + VARIANT_TRUE : VARIANT_FALSE; + } else { + FIXME("%s not implemented\n", debugstr_w(bstrItem)); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI WMPControls_play(IWMPControls *iface) @@ -1428,11 +1441,16 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) if (SUCCEEDED(hres)) hres = IGraphBuilder_RenderFile(This->filter_graph, media->url, NULL); + if (SUCCEEDED(hres)) + update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaControl, (void**)&This->media_control); if (SUCCEEDED(hres)) - update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaSeeking, + (void**)&This->media_seeking); + if (SUCCEEDED(hres)) + hres = IMediaSeeking_SetTimeFormat(This->media_seeking, &TIME_FORMAT_MEDIA_TIME); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaEvent, (void**)&This->media_event); @@ -1459,7 +1477,10 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) } if (SUCCEEDED(hres)) { + LONGLONG duration; update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsPlaying); + if (SUCCEEDED(IMediaSeeking_GetDuration(This->media_seeking, &duration))) + media->duration = (DOUBLE)duration / 10000000.0f; } else { update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsUndefined); } @@ -1482,11 +1503,14 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) if (This->media_event) { IMediaEvent_Release(This->media_event); } - + if (This->media_seeking) { + IMediaSeeking_Release(This->media_seeking); + } IGraphBuilder_Release(This->filter_graph); This->filter_graph = NULL; This->media_control = NULL; This->media_event = NULL; + This->media_seeking = NULL; update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistOpenNoMedia); update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsStopped); @@ -1517,15 +1541,33 @@ static HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) static HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%p)\n", This, pdCurrentPosition); - return E_NOTIMPL; + HRESULT hres; + LONGLONG currentPosition; + + TRACE("(%p)->(%p)\n", This, pdCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + hres = IMediaSeeking_GetCurrentPosition(This->media_seeking, &currentPosition); + *pdCurrentPosition = (DOUBLE) currentPosition / 10000000.0f; + TRACE("hres: %d, pos: %f\n", hres, *pdCurrentPosition); + return hres; } static HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) { + LONGLONG Current; + HRESULT hres; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%f)\n", This, dCurrentPosition); - return E_NOTIMPL; + TRACE("(%p)->(%f)\n", This, dCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + Current = 10000000 * dCurrentPosition; + hres = IMediaSeeking_SetPositions(This->media_seeking, &Current, + AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); + + return hres; } static HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) @@ -1762,9 +1804,12 @@ static HRESULT WINAPI WMPMedia_getMarkerName(IWMPMedia *iface, LONG MarkerNum, B static HRESULT WINAPI WMPMedia_get_duration(IWMPMedia *iface, DOUBLE *pDuration) { + /* MSDN: If this property is used with a media item other than the one + * specified in Player.currentMedia, it may not contain a valid value. */ WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%p)\n", This, pDuration); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pDuration); + *pDuration = This->duration; + return S_OK; } static HRESULT WINAPI WMPMedia_get_durationString(IWMPMedia *iface, BSTR *pbstrDuration) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index c2cd1cf941..ff6331bd86 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -303,6 +303,11 @@ static BOOL test_wmp(void) static DWORD dw = 100; IWMPSettings *settings; BOOL test_ran = TRUE; + DOUBLE duration; + VARIANT_BOOL vbool; + IWMPMedia *media; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + BSTR bstrcurrentPosition = SysAllocString(currentPosition); hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -338,6 +343,10 @@ static BOOL test_wmp(void) ok(hres == S_OK, "get_controls failed: %08x\n", hres); ok(controls != NULL, "controls = NULL\n"); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_FALSE, "unexpected value\n"); + hres = IWMPControls_play(controls); ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); @@ -380,6 +389,37 @@ static BOOL test_wmp(void) /* MediaOpening happens only on xp, 2003 */ CLEAR_CALLED(OPENSTATE, wmposMediaOpening); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_TRUE, "unexpected value\n"); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + ok((int)duration == 0, "unexpected value %f\n", duration); + + duration = 15.0; + hres = IWMPControls_put_currentPosition(controls, duration); + ok(hres == S_OK, "IWMPControls_put_currentPosition failed: %08x\n", hres); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + /* builtin quartz does not handle this currently and resets to 0.0, works + * with native quartz */ + todo_wine ok((int)duration >= 15.0, "unexpected value %f\n", duration); + + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_OK, "IWMPPlayer4_get_currentMedia failed: %08x\n", hres); + hres = IWMPMedia_get_duration(media, &duration); + ok(hres == S_OK, "IWMPMedia_get_duration failed: %08x\n", hres); + ok( + round(duration) == 60 || + broken(round(duration) == 30) || + broken(round(duration) == 57), + "unexpected value: %f\n", duration); + IWMPMedia_Release(media); + SET_EXPECT(PLAYSTATE, wmppsStopped); /* The following happens on wine only since we close media on stop */ SET_EXPECT(OPENSTATE, wmposPlaylistOpenNoMedia); @@ -414,6 +454,7 @@ playback_skip: IOleObject_Release(oleobj); DeleteFileW(filename); SysFreeString(filename); + SysFreeString(bstrcurrentPosition); return test_ran; } diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 3792e52abd..e8d534803f 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -42,6 +42,8 @@ typedef struct { LONG ref; WCHAR *url; + + DOUBLE duration; } WMPMedia; struct WindowsMediaPlayer { @@ -76,6 +78,7 @@ struct WindowsMediaPlayer { IGraphBuilder* filter_graph; IMediaControl* media_control; IMediaEvent* media_event; + IMediaSeeking* media_seeking; /* Async event notification */ HWND msg_window; -- 2.17.0

3 7

[PATCH vkd3d 01/10] libs/vkd3d: Propagate error code in vkd3d_fence_worker_stop().
by Józef Kucia 16 Apr '18

16 Apr '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d9ad8f3460b8..5605ab007381 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -309,7 +309,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, if (FAILED(hr = device->join_thread(worker->u.handle))) { ERR("Failed to join fence worker thread, hr %#x.\n", hr); - return E_FAIL; + return hr; } } else -- 2.16.1

4 20

[PATCH] msi: Recognize remote package URLs when BaseURL is NULL
by Anton Romanov 16 Apr '18

16 Apr '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/msi/media.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 0bb883b34a..f72a411410 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -858,7 +858,8 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) /* package should be downloaded */ if (compressed && GetFileAttributesW( cabinet_file ) == INVALID_FILE_ATTRIBUTES && - package->BaseURL && UrlIsW( package->BaseURL, URLIS_URL )) + ((package->BaseURL && UrlIsW( package->BaseURL, URLIS_URL )) || + UrlIsW( cabinet_file, URLIS_URL ))) { WCHAR temppath[MAX_PATH], *p; -- 2.17.0

2 2