March 2019 - Wine-commits - list.winehq.org

Andrew Wesie : wined3d: Remove extraneous flush from EndScene.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 666f63770fa04b9b8ae60024e144f994dd23734d URL: https://source.winehq.org/git/wine.git/?a=commit;h=666f63770fa04b9b8ae60024… Author: Andrew Wesie <awesie(a)gmail.com> Date: Thu Sep 27 13:40:23 2018 -0500 wined3d: Remove extraneous flush from EndScene. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45724 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 504380a2b3122d7a44c20fd96a12d8309fdf1822) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d5c12b8..580c507 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3568,8 +3568,6 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) return WINED3DERR_INVALIDCALL; } - wined3d_cs_emit_flush(device->cs); - device->inScene = FALSE; return WINED3D_OK; }

1 0

Gijs Vermeulen : msvcr100: Add Concurrency::wait stub.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: c027a45787453954ccc1c11b68cc97cf31efabca URL: https://source.winehq.org/git/wine.git/?a=commit;h=c027a45787453954ccc1c11b… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Sep 6 22:13:04 2018 +0200 msvcr100: Add Concurrency::wait stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 58e3ac93ac21c652fe1651c6e1594c0b87672b23) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/lock.c | 10 ++++++++++ 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 45da73a..c36a3d6 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -516,7 +516,7 @@ @ cdecl -arch=win64 ?unlock(a)critical_section@Concurrency@@QEAAXXZ(ptr) msvcr120.?unlock(a)critical_section@Concurrency@@QEAAXXZ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) msvcr120.?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) msvcr120.?wait(a)Concurrency@@YAXI(a)Z @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z @ stub -arch=win32 ?wait(a)agent@Concurrency@@SA?AW4agent_status(a)2@PAV12(a)I@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e707fb7..fc895c2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -496,7 +496,7 @@ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) reader_writer_lock_unlock @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) MSVCRT_vsnwprintf -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) Concurrency_wait @ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr) event_wait @ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr) event_wait @ cdecl -arch=win32 ?wait_for_multiple(a)event@Concurrency@@SAIPAPAV12(a)I_NI@Z(ptr long long long) event_wait_for_multiple diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index fca3683..dee7f05 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -808,7 +808,7 @@ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) reader_writer_lock_unlock @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) MSVCRT_vsnwprintf -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) Concurrency_wait @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 109666e..53a99f3 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -790,7 +790,7 @@ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) reader_writer_lock_unlock @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) MSVCRT_vsnwprintf -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) Concurrency_wait @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 064aa77..fa5711f 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -786,7 +786,7 @@ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) msvcr120.?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) msvcr120.?vswprintf@@YAHPA_WIPB_WPAD(a)Z -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) msvcr120.?wait(a)Concurrency@@YAXI(a)Z @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index cd094e7..2e0865d 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -1301,6 +1301,16 @@ MSVCRT_bool __thiscall _ReentrantBlockingLock__TryAcquire(_ReentrantBlockingLock TRACE("(%p)\n", this); return TryEnterCriticalSection(&this->cs); } + +/* ?wait(a)Concurrency@@YAXI(a)Z */ +void __cdecl Concurrency_wait(unsigned int time) +{ + static int once; + + if (!once++) FIXME("(%d) stub!\n", time); + + Sleep(time); +} #endif #if _MSVCR_VER == 110

1 0

Dmitry Timoshkov : windowscodecs: IWICMetadataQueryReader:: GetMetadataByName() should accept NULL for returned value.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 7d8d075db6c71122322703bed91cb906894efb86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d8d075db6c71122322703be… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Sep 16 18:01:41 2018 +0800 windowscodecs: IWICMetadataQueryReader::GetMetadataByName() should accept NULL for returned value. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1593f146ec55d96b3e56b1b8688bf32fa1dd9f42) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 2 +- dlls/windowscodecs/tests/metadata.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index e338848..a2b5841 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -589,7 +589,7 @@ static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, LPCW PropVariantClear(&tk_id); PropVariantClear(&tk_schema); - if (hr == S_OK) + if (hr == S_OK && value) *value = new_value; else PropVariantClear(&new_value); diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index c54d7df..27dee3e 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1606,6 +1606,10 @@ static void test_metadata_gif(void) if (winetest_debug > 1) trace("query: %s\n", decoder_data[i].query); MultiByteToWideChar(CP_ACP, 0, decoder_data[i].query, -1, queryW, 256); + + hr = IWICMetadataQueryReader_GetMetadataByName(queryreader, queryW, NULL); + ok(hr == decoder_data[i].hr, "GetMetadataByName(%s) returned %#x, expected %#x\n", wine_dbgstr_w(queryW), hr, decoder_data[i].hr); + PropVariantInit(&value); hr = IWICMetadataQueryReader_GetMetadataByName(queryreader, queryW, &value); ok(hr == decoder_data[i].hr, "GetMetadataByName(%s) returned %#x, expected %#x\n", wine_dbgstr_w(queryW), hr, decoder_data[i].hr);

1 0

André Hentschel : kernel32: Add stub for SetProcessWorkingSetSizeEx.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 5f36e93ffd5d2ebd92d19c41992cb56e460fe60d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f36e93ffd5d2ebd92d19c41… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 16 16:59:21 2018 +0200 kernel32: Add stub for SetProcessWorkingSetSizeEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45523 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7e39544bfa6cf3e68a8567c202624f7f2d3fc7c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- .../api-ms-win-core-memory-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 28 ++++++++++++++++++---- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 6 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index 42630c1..3200be9 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -15,7 +15,7 @@ @ stdcall QueryMemoryResourceNotification(ptr ptr) kernel32.QueryMemoryResourceNotification @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch -@ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx @ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec index 6100213..57a5b10 100644 --- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -21,7 +21,7 @@ @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stub RegisterBadMemoryNotification @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch -@ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx @ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ada2355..724c9ef 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1432,7 +1432,7 @@ @ stdcall SetProcessShutdownParameters(long long) # @ stub SetProcessUserModeExceptionPolicy @ stdcall SetProcessWorkingSetSize(long long long) -# @ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) @ stdcall SetSearchPathMode(long) @ stdcall SetStdHandle(long long) # @ stub SetStdHandleEx diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index a0817e0..7fdbcfc 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3419,22 +3419,22 @@ err: /*********************************************************************** - * SetProcessWorkingSetSize [KERNEL32.@] + * SetProcessWorkingSetSizeEx [KERNEL32.@] * Sets the min/max working set sizes for a specified process. * * PARAMS - * hProcess [I] Handle to the process of interest + * process [I] Handle to the process of interest * minset [I] Specifies minimum working set size * maxset [I] Specifies maximum working set size + * flags [I] Flags to enforce working set sizes * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset, - SIZE_T maxset) +BOOL WINAPI SetProcessWorkingSetSizeEx(HANDLE process, SIZE_T minset, SIZE_T maxset, DWORD flags) { - WARN("(%p,%ld,%ld): stub - harmless\n",hProcess,minset,maxset); + WARN("(%p,%ld,%ld,%x): stub - harmless\n", process, minset, maxset, flags); if(( minset == (SIZE_T)-1) && (maxset == (SIZE_T)-1)) { /* Trim the working set to zero */ /* Swap the process out of physical RAM */ @@ -3443,6 +3443,24 @@ BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset, } /*********************************************************************** + * SetProcessWorkingSetSize [KERNEL32.@] + * Sets the min/max working set sizes for a specified process. + * + * PARAMS + * process [I] Handle to the process of interest + * minset [I] Specifies minimum working set size + * maxset [I] Specifies maximum working set size + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI SetProcessWorkingSetSize(HANDLE process, SIZE_T minset, SIZE_T maxset) +{ + return SetProcessWorkingSetSizeEx(process, minset, maxset, 0); +} + +/*********************************************************************** * K32EmptyWorkingSet (KERNEL32.@) */ BOOL WINAPI K32EmptyWorkingSet(HANDLE hProcess) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 3c31d03..cf1f7eb 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1461,7 +1461,7 @@ @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters # @ stub SetProcessValidCallTargets -# @ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx # @ stub SetProtectedPolicy # @ stub SetRoamingLastObservedChangeTime @ stub SetSecurityAccessMask diff --git a/include/winbase.h b/include/winbase.h index e06be3c..b248228 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2560,6 +2560,7 @@ WINBASEAPI BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD_PTR); WINBASEAPI BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL); WINBASEAPI BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD); WINBASEAPI BOOL WINAPI SetProcessWorkingSetSize(HANDLE,SIZE_T,SIZE_T); +WINBASEAPI BOOL WINAPI SetProcessWorkingSetSizeEx(HANDLE,SIZE_T,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI SetSearchPathMode(DWORD); WINADVAPI BOOL WINAPI SetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,SECURITY_DESCRIPTOR_CONTROL,SECURITY_DESCRIPTOR_CONTROL); WINADVAPI BOOL WINAPI SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL);

1 0

Dmitry Timoshkov : kernel32: Add support for MOVEFILE_WRITE_THROUGH to MoveFile.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 19aea0583587cbde0dd2f665377be179acd37686 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19aea0583587cbde0dd2f665… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 2 14:04:38 2018 +0800 kernel32: Add support for MOVEFILE_WRITE_THROUGH to MoveFile. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 97d2d9bf603d2356bdc1989b61a0b4e6f8f8ec31) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/path.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a389743..6d2a902 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1283,6 +1283,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle; ANSI_STRING source_unix, dest_unix; + DWORD options; TRACE("(%s,%s,%p,%p,%04x)\n", debugstr_w(source), debugstr_w(dest), fnProgress, param, flag ); @@ -1293,9 +1294,6 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, if (!dest) return DeleteFileW( source ); - if (flag & MOVEFILE_WRITE_THROUGH) - FIXME("MOVEFILE_WRITE_THROUGH unimplemented\n"); - /* check if we are allowed to rename the source */ if (!RtlDosPathNameToNtPathName_U( source, &nt_name, NULL, NULL )) @@ -1336,8 +1334,11 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, - FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + + options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; + if (flag & MOVEFILE_WRITE_THROUGH) + options |= FILE_WRITE_THROUGH; + status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, options ); if (status == STATUS_SUCCESS) /* destination exists */ { NtClose( dest_handle );

1 0

Alistair Leslie-Hughes : include: Add more types to ntifs.h.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 7ca874ad6268c4b2f90b87824d9570a9d22ddf2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca874ad6268c4b2f90b8782… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 21 05:40:17 2018 +0000 include: Add more types to ntifs.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 210bb7ddb4e0888a43e66d41b18cba2165fcc3aa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/ddk/ntifs.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 32c9e30..8c63d0b 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -19,8 +19,24 @@ #ifndef __NTIFS_H__ #define __NTIFS_H__ +#include "ntddk.h" + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; +typedef enum _FS_FILTER_SECTION_SYNC_TYPE +{ + SyncTypeOther = 0, + SyncTypeCreateSection +} FS_FILTER_SECTION_SYNC_TYPE, *PFS_FILTER_SECTION_SYNC_TYPE; + +typedef struct _FS_FILTER_SECTION_SYNC_OUTPUT +{ + ULONG StructureSize; + ULONG SizeReturned; + ULONG Flags; + ULONG DesiredReadAlignment; +} FS_FILTER_SECTION_SYNC_OUTPUT, *PFS_FILTER_SECTION_SYNC_OUTPUT; + typedef struct _KQUEUE { DISPATCHER_HEADER Header; @@ -30,6 +46,7 @@ typedef struct _KQUEUE LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; + NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); #endif

1 0

Jactry Zeng : ntoskrnl: Add FsRtlIsNameInExpression stub.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 63d716ce191824da1b5dc4822b7041eb2b23a31c URL: https://source.winehq.org/git/wine.git/?a=commit;h=63d716ce191824da1b5dc482… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Sep 14 16:59:47 2018 +0800 ntoskrnl: Add FsRtlIsNameInExpression stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41039 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c43030b664da2345b4763ea3feb664ac722e1148) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntifs.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 521350b..5085f27 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1818,6 +1818,16 @@ NTSTATUS WINAPI ExInitializeZone(PZONE_HEADER Zone, } /*********************************************************************** +* FsRtlIsNameInExpression (NTOSKRNL.EXE.@) +*/ +BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING expression, PUNICODE_STRING name, + BOOLEAN ignore, PWCH upcase) +{ + FIXME("stub: %p %p %d %p\n", expression, name, ignore, upcase); + return FALSE; +} + +/*********************************************************************** * FsRtlRegisterUncProvider (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI FsRtlRegisterUncProvider(PHANDLE MupHandle, PUNICODE_STRING RedirDevName, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 46a1dee..bdf2a9f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -233,7 +233,7 @@ @ stub FsRtlIsDbcsInExpression @ stub FsRtlIsFatDbcsLegal @ stub FsRtlIsHpfsDbcsLegal -@ stub FsRtlIsNameInExpression +@ stdcall FsRtlIsNameInExpression(ptr ptr long ptr) @ stub FsRtlIsNtstatusExpected @ stub FsRtlIsPagingFile @ stub FsRtlIsTotalDeviceFailure diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 8c63d0b..8295b4e 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -47,6 +47,7 @@ typedef struct _KQUEUE } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; +BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); #endif

1 0

Zebediah Figura : rpcrt4/tests: Add tests for delegated proxy methods.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: a6dec7cc5d5f136e819c1b381175022ee56cafa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6dec7cc5d5f136e819c1b38… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 13 11:01:12 2018 -0500 rpcrt4/tests: Add tests for delegated proxy methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b82382f5fee8b9ca619c500f090797035f223b09) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/tests/Makefile.in | 5 +- dlls/rpcrt4/tests/cstub.c | 245 ++++++++++++++++++++++++++++++++++++++++-- dlls/rpcrt4/tests/cstub.idl | 37 +++++++ 3 files changed, 280 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in index 5b80bc3..d8353b6 100644 --- a/dlls/rpcrt4/tests/Makefile.in +++ b/dlls/rpcrt4/tests/Makefile.in @@ -1,6 +1,7 @@ TESTDLL = rpcrt4.dll IMPORTS = oleaut32 ole32 rpcrt4 secur32 advapi32 EXTRAIDLFLAGS = --prefix-server=s_ +EXTRADEFS = -DPROXY_DELEGATION C_SRCS = \ cstub.c \ @@ -10,4 +11,6 @@ C_SRCS = \ rpc_async.c \ server.c -IDL_SRCS = server.idl +IDL_SRCS = \ + cstub.idl \ + server.idl diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 606107f..b0a8db7 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -19,11 +19,10 @@ */ #include <stdarg.h> +#include <stdio.h> -#define PROXY_DELEGATION #define COBJMACROS -#include "wine/test.h" #include <windef.h> #include <winbase.h> #include <winnt.h> @@ -35,10 +34,22 @@ #include "rpcdce.h" #include "rpcproxy.h" +#include "wine/heap.h" +#include "wine/test.h" + +#include "cstub.h" + static CStdPSFactoryBuffer PSFactoryBuffer; -CSTDSTUBBUFFERRELEASE(&PSFactoryBuffer) -CSTDSTUBBUFFER2RELEASE(&PSFactoryBuffer) +static ULONG WINAPI test_CStdStubBuffer_Release(IRpcStubBuffer *This) +{ + return NdrCStdStubBuffer_Release(This, (IPSFactoryBuffer *)&PSFactoryBuffer); +} + +static ULONG WINAPI test_CStdStubBuffer2_Release(IRpcStubBuffer *This) +{ + return NdrCStdStubBuffer2_Release(This, (IPSFactoryBuffer *)&PSFactoryBuffer); +} static GUID IID_if1 = {0x12345678, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static GUID IID_if2 = {0x12345679, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; @@ -186,7 +197,18 @@ static CInterfaceStubVtbl if1_stub_vtbl = 5, &if1_table[-3] }, - { CStdStubBuffer_METHODS } + { + CStdStubBuffer_QueryInterface, + CStdStubBuffer_AddRef, + test_CStdStubBuffer_Release, + CStdStubBuffer_Connect, + CStdStubBuffer_Disconnect, + CStdStubBuffer_Invoke, + CStdStubBuffer_IsIIDSupported, + CStdStubBuffer_CountRefs, + CStdStubBuffer_DebugServerQueryInterface, + CStdStubBuffer_DebugServerRelease + } }; static CINTERFACE_PROXY_VTABLE(13) if2_proxy_vtbl = @@ -257,7 +279,7 @@ static CInterfaceStubVtbl if2_stub_vtbl = 13, &if2_table[-3] }, - { CStdStubBuffer_DELEGATING_METHODS } + { 0, 0, test_CStdStubBuffer2_Release, 0, 0, 0, 0, 0, 0, 0 } }; static CINTERFACE_PROXY_VTABLE(5) if3_proxy_vtbl = @@ -1194,9 +1216,219 @@ static void test_NdrDllRegisterProxy( void ) } } +static HANDLE create_process(const char *arg) +{ + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + char cmdline[200]; + char **argv; + BOOL ret; + + si.cb = sizeof(si); + winetest_get_mainargs(&argv); + sprintf(cmdline, "\"%s\" %s %s", argv[0], argv[1], arg); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed: %u\n", GetLastError()); + CloseHandle(pi.hThread); + return pi.hProcess; +} + +DEFINE_GUID(CLSID_test1,0xdeadf00d,0x0001,0x44c7,0x85,0x0f,0x2a,0x0f,0x46,0x5c,0x0c,0x6c); + +static HRESULT WINAPI test1_QueryInterface(ITest1 *iface, REFIID iid, void **out) +{ + if (winetest_debug > 1) trace("%s\n", wine_dbgstr_guid(iid)); + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_ITest1)) + { + *out = iface; + return S_OK; + } + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test1_AddRef(ITest1 *iface) +{ + return 2; +} + +static ULONG WINAPI test1_Release(ITest1 *iface) +{ + return 1; +} + +static HRESULT WINAPI test1_GetClassID(ITest1 *iface, CLSID *clsid) +{ + *clsid = CLSID_test1; + return S_OK; +} + +static int WINAPI test1_square(ITest1 *iface, int x) +{ + return x * x; +} + +static const ITest1Vtbl test1_vtbl = +{ + test1_QueryInterface, + test1_AddRef, + test1_Release, + test1_GetClassID, + test1_square, +}; + +static HRESULT WINAPI test_cf_QueryInterface(IClassFactory *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IClassFactory)) + { + *out = iface; + return S_OK; + } + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_cf_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI test_cf_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI test_cf_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID iid, void **out) +{ + ITest1 *obj = heap_alloc(sizeof(*obj)); + + obj->lpVtbl = &test1_vtbl; + + return ITest1_QueryInterface(obj, iid, out); +} + +static HRESULT WINAPI test_cf_LockServer(IClassFactory *iface, BOOL lock) +{ + return S_OK; +} + +static const IClassFactoryVtbl test_cf_vtbl = +{ + test_cf_QueryInterface, + test_cf_AddRef, + test_cf_Release, + test_cf_CreateInstance, + test_cf_LockServer, +}; + +static IClassFactory test_cf = { &test_cf_vtbl }; + +extern CStdPSFactoryBuffer gPFactory; +extern const ProxyFileInfo * aProxyFileList; + +static void local_server_proc(void) +{ + DWORD obj_cookie, ps_cookie, index; + HANDLE stop_event, ready_event; + IPSFactoryBuffer *ps; + HRESULT hr; + + stop_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "wine_cstub_test_server_stop"); + ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "wine_cstub_test_server_ready"); + + CoInitialize(NULL); + + hr = CoRegisterClassObject(&CLSID_test1, (IUnknown *)&test_cf, + CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, &obj_cookie); + ok(hr == S_OK, "got %#x\n", hr); + + hr = NdrDllGetClassObject(&CLSID_test_ps, &IID_IPSFactoryBuffer, (void **)&ps, + &aProxyFileList, &CLSID_test_ps, &gPFactory); + ok(hr == S_OK, "got %#x\n", hr); + + hr = CoRegisterClassObject(&CLSID_test_ps, (IUnknown *)ps, + CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &ps_cookie); + ok(hr == S_OK, "got %#x\n", hr); + + hr = CoRegisterPSClsid(&IID_ITest1, &CLSID_test_ps); + ok(hr == S_OK, "got %#x\n", hr); + + SetEvent(ready_event); + + hr = CoWaitForMultipleHandles(0, 1000, 1, &stop_event, &index); + ok(hr == S_OK, "got %#x\n", hr); + ok(!index, "got %u\n", index); + + hr = CoRevokeClassObject(ps_cookie); + ok(hr == S_OK, "got %#x\n", hr); + + hr = CoRevokeClassObject(obj_cookie); + ok(hr == S_OK, "got %#x\n", hr); + + CoUninitialize(); + ExitProcess(0); +} + +static void test_delegated_methods(void) +{ + HANDLE process, stop_event, ready_event; + IPSFactoryBuffer *ps; + ITest1 *test_obj; + DWORD ps_cookie; + CLSID clsid; + HRESULT hr; + int ret; + + stop_event = CreateEventA(NULL, TRUE, FALSE, "wine_cstub_test_server_stop"); + ready_event = CreateEventA(NULL, TRUE, FALSE, "wine_cstub_test_server_ready"); + + process = create_process("server"); + ok(!WaitForSingleObject(ready_event, 1000), "wait failed\n"); + + hr = NdrDllGetClassObject(&CLSID_test_ps, &IID_IPSFactoryBuffer, (void **)&ps, + &aProxyFileList, &CLSID_test_ps, &gPFactory); + ok(hr == S_OK, "got %#x\n", hr); + + hr = CoRegisterClassObject(&CLSID_test_ps, (IUnknown *)ps, + CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &ps_cookie); + ok(hr == S_OK, "got %#x\n", hr); + + hr = CoRegisterPSClsid(&IID_ITest1, &CLSID_test_ps); + ok(hr == S_OK, "got %#x\n", hr); + + hr = CoCreateInstance(&CLSID_test1, NULL, CLSCTX_LOCAL_SERVER, &IID_ITest1, (void **)&test_obj); + ok(hr == S_OK, "got %#x\n", hr); + + ret = ITest1_square(test_obj, 3); + ok(ret == 9, "got %d\n", ret); + + hr = ITest1_GetClassID(test_obj, &clsid); +todo_wine { + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_test1), "got %s\n", wine_dbgstr_guid(&clsid)); +} + + ITest1_Release(test_obj); + + SetEvent(stop_event); + ok(!WaitForSingleObject(process, 1000), "wait failed\n"); + + hr = CoRevokeClassObject(ps_cookie); + ok(hr == S_OK, "got %#x\n", hr); +} + START_TEST( cstub ) { IPSFactoryBuffer *ppsf; + int argc; + char **argv; + + argc = winetest_get_mainargs( &argv ); + if (argc > 2 && !strcmp(argv[2], "server")) + { + local_server_proc(); + return; + } OleInitialize(NULL); @@ -1209,6 +1441,7 @@ START_TEST( cstub ) test_Release(ppsf); test_delegating_Invoke(ppsf); test_NdrDllRegisterProxy(); + test_delegated_methods(); OleUninitialize(); } diff --git a/dlls/rpcrt4/tests/cstub.idl b/dlls/rpcrt4/tests/cstub.idl new file mode 100644 index 0000000..461bd87 --- /dev/null +++ b/dlls/rpcrt4/tests/cstub.idl @@ -0,0 +1,37 @@ +/* + * IDL to test COM object proxy/stub functions + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep proxy + +import "oleidl.idl"; + +[ + uuid(deadbeef-0001-44c7-850f-2a0f465c0c6c), + object +] +interface ITest1 : IPersist +{ + int square(int x); +} + +[ + uuid(deadbeef-ffff-44c7-850f-2a0f465c0c6c) +] +coclass test_ps { interface IPSFactoryBuffer; }

1 0

Alexandre Julliard : Wine release 4.3
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: website Branch: master Commit: 3cc5254e2b51d9d24e8feabe0b7e2568e365f6ad URL: https://source.winehq.org/git/website.git/?a=commit;h=3cc5254e2b51d9d24e8fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 23:42:30 2019 +0100 Wine release 4.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019030101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2019030101.xml b/news/en/2019030101.xml new file mode 100644 index 0000000..2aa9ddc --- /dev/null +++ b/news/en/2019030101.xml @@ -0,0 +1,16 @@ +<news> +<date>March 1, 2019</date> +<title>Wine 4.3 Released</title> +<body> + The Wine development release 4.3 is now available. + <a href="{$root}/announce/4.3">What's new</a> in this release: +<ul> + <li>Reimplementation of XAudio2 using the FAudio library.</li> + <li>Mono engine updated to the latest upstream.</li> + <li>More modern handling of iconic windows.</li> + <li>Improved handling of kernel objects.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Vijay Kiran Kamuju : include: Add missing IWMSyncReader2 interfaces.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 5bf03561b2dba1714324d902f486c0593a92bba4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bf03561b2dba1714324d902… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Feb 27 21:48:35 2019 +0100 include: Add missing IWMSyncReader2 interfaces. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index bb7bfee..1a0b3e4 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -209,6 +209,14 @@ typedef struct _WMStreamPrioritizationRecord WORD wStreamNumber; BOOL fMandatory; } WM_STREAM_PRIORITY_RECORD; + +typedef struct _WMT_TIMECODE_EXTENSION_DATA +{ + WORD wRange; + DWORD dwTimecode; + DWORD dwUserbits; + DWORD dwAmFlags; +} WMT_TIMECODE_EXTENSION_DATA; #include <poppack.h> typedef struct _WM_PORT_NUMBER_RANGE @@ -1058,6 +1066,69 @@ interface IWMSyncReader : IUnknown [ object, + uuid(9f762fa7-a22e-428d-93c9-ac82f3aafe5a), + pointer_default( unique ), + local +] +interface IWMReaderAllocatorEx : IUnknown +{ + HRESULT AllocateForStreamEx( + [in] WORD wStreamNum, + [in] DWORD cbBuffer, + [out] INSSBuffer **ppBuffer, + [in] DWORD dwFlags, + [in] QWORD cnsSampleTime, + [in] QWORD cnsSampleDuration, + [in] void *pvContext); + + HRESULT AllocateForOutputEx( + [in] WORD wOutputNum, + [in] DWORD cbBuffer, + [out] INSSBuffer **ppBuffer, + [in] DWORD dwFlags, + [in] QWORD cnsSampleTime, + [in] QWORD cnsSampleDuration, + [in] void *pvContext); +} + +[ + object, + uuid(faed3d21-1b6b-4af7-8bc6-3e189bbc187b), + pointer_default( unique ), + local +] +interface IWMSyncReader2 : IWMSyncReader +{ + HRESULT SetRangeByTimecode( + [in] WORD wStreamNum, + [in] WMT_TIMECODE_EXTENSION_DATA *pStart, + [in] WMT_TIMECODE_EXTENSION_DATA *pEnd); + + HRESULT SetRangeByFrameEx( + [in] WORD wStreamNum, + [in] QWORD qwFrameNumber, + [in] LONGLONG cFramesToRead, + [out] QWORD *pcnsStartTime); + + HRESULT SetAllocateForOutput( + [in] DWORD dwOutputNum, + [in] IWMReaderAllocatorEx *pAllocator); + + HRESULT GetAllocateForOutput( + [in] DWORD dwOutputNum, + [out] IWMReaderAllocatorEx **ppAllocator); + + HRESULT SetAllocateForStream( + [in] DWORD dwStreamNum, + [in] IWMReaderAllocatorEx *pAllocator); + + HRESULT GetAllocateForStream( + [in] DWORD dwStreamNum, + [out] IWMReaderAllocatorEx **ppAllocator); +} + +[ + object, uuid(96406bd5-2b2b-11d3-b36b-00c04f6108ff), pointer_default(unique), local @@ -1791,6 +1862,7 @@ cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") +cpp_quote("HRESULT WINAPI WMCreateSyncReader(IUnknown*,DWORD,IWMSyncReader**);") cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")

1 0