Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MMIXER_TEST] Fix build (Use %Iu for dwUser)
by Katayama Hirofumi MZ 08 Dec '19

08 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a1ba2cb356ecba7e7248… commit 2a1ba2cb356ecba7e7248e56e3bf930685b27006 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 8 13:11:52 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Dec 8 13:11:52 2019 +0900 [MMIXER_TEST] Fix build (Use %Iu for dwUser) --- modules/rostests/tests/mmixer_test/test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/tests/mmixer_test/test.c b/modules/rostests/tests/mmixer_test/test.c index cb5338fc9b1..6e8a1354b7c 100644 --- a/modules/rostests/tests/mmixer_test/test.c +++ b/modules/rostests/tests/mmixer_test/test.c @@ -83,7 +83,7 @@ printMixerLine(LPMIXERLINEW MixerLine, IN ULONG MixerIndex) printf("dwDestination %lu\n", MixerLine->dwDestination); printf("dwLineID %lx\n", MixerLine->dwLineID); printf("dwSource %lx\n", MixerLine->dwSource); - printf("dwUser %lu\n", MixerLine->dwUser); + printf("dwUser %Iu\n", MixerLine->dwUser); printf("fdwLine %lu\n", MixerLine->fdwLine); printf("szName %S\n", MixerLine->szName); printf("szShortName %S\n", MixerLine->szShortName);

1 0

[reactos] 01/01: [WINMM_WINETEST][SDK][INCLUDE] Try to fix MSVC winmm:generated build
by Katayama Hirofumi MZ 08 Dec '19

08 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=312d52277ac04153432e3… commit 312d52277ac04153432e376f2cbb61d1cb63d8ba Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 8 12:45:33 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Dec 8 12:45:51 2019 +0900 [WINMM_WINETEST][SDK][INCLUDE] Try to fix MSVC winmm:generated build --- sdk/include/psdk/mmsystem.h | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/sdk/include/psdk/mmsystem.h b/sdk/include/psdk/mmsystem.h index b97e2ad4bc3..b3b2347c890 100644 --- a/sdk/include/psdk/mmsystem.h +++ b/sdk/include/psdk/mmsystem.h @@ -1151,12 +1151,12 @@ typedef struct midihdr_tag { LPSTR lpData; DWORD dwBufferLength; DWORD dwBytesRecorded; - DWORD dwUser; + DWORD_PTR dwUser; DWORD dwFlags; struct midihdr_tag *lpNext; - DWORD reserved; + DWORD_PTR reserved; DWORD dwOffset; - DWORD dwReserved[8]; + DWORD_PTR dwReserved[8]; } MIDIHDR,*PMIDIHDR,*LPMIDIHDR; typedef struct midievent_tag { @@ -1234,7 +1234,7 @@ typedef struct tagMIXERLINEA { DWORD dwSource; DWORD dwLineID; DWORD fdwLine; - DWORD dwUser; + DWORD_PTR dwUser; DWORD dwComponentType; DWORD cChannels; DWORD cConnections; @@ -1257,7 +1257,7 @@ typedef struct tagMIXERLINEW { DWORD dwSource; DWORD dwLineID; DWORD fdwLine; - DWORD dwUser; + DWORD_PTR dwUser; DWORD dwComponentType; DWORD cChannels; DWORD cConnections; @@ -1693,16 +1693,26 @@ typedef struct tagMCI_WAVE_SET_PARMS { DWORD dwAudio; UINT wInput; UINT wOutput; +#ifdef _WIN64 + DWORD wFormatTag; + DWORD nChannels; +#else WORD wFormatTag; WORD wReserved2; WORD nChannels; WORD wReserved3; +#endif DWORD nSamplesPerSec; DWORD nAvgBytesPerSec; +#ifdef _WIN64 + DWORD nBlockAlign; + DWORD wBitsPerSample; +#else WORD nBlockAlign; WORD wReserved4; WORD wBitsPerSample; WORD wReserved5; +#endif } MCI_WAVE_SET_PARMS,*PMCI_WAVE_SET_PARMS,*LPMCI_WAVE_SET_PARMS; typedef struct tagWAVEOUTCAPS2A {

1 0

[reactos] 01/01: [WINLOGON] Start the screensaver on the user desktop, since support for secure screensaver desktop is not completely implemented in Winlogon. CORE-16548
by Hermès Bélusca-Maïto 08 Dec '19

08 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40db38571689131bb8692… commit 40db38571689131bb8692f7bde7e9c37215edbce Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 8 02:26:26 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 8 02:27:21 2019 +0100 [WINLOGON] Start the screensaver on the user desktop, since support for secure screensaver desktop is not completely implemented in Winlogon. CORE-16548 --- base/system/winlogon/screensaver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base/system/winlogon/screensaver.c b/base/system/winlogon/screensaver.c index e56c688df8f..6bd681ca39e 100644 --- a/base/system/winlogon/screensaver.c +++ b/base/system/winlogon/screensaver.c @@ -329,7 +329,9 @@ StartScreenSaver( StartupInfo.cb = sizeof(STARTUPINFOW); StartupInfo.dwFlags = STARTF_SCREENSAVER; - /* FIXME: run the screen saver on the screen saver desktop */ + /* FIXME: Run the screen saver on the secure screen saver desktop if required */ + StartupInfo.lpDesktop = L"WinSta0\\Default"; + ret = CreateProcessW(szApplicationName, szCommandLine, NULL,

1 0

[reactos] 01/01: [PSDK] Replace the wine version of lmjoin.h by an extended version that includes NetJoinDomain and NetUnjoinDomain.
by Eric Kohl 08 Dec '19

08 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a80b30ad2851a1159227… commit 0a80b30ad2851a1159227f6cfa670059c51351a1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 8 02:03:26 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 8 02:03:26 2019 +0100 [PSDK] Replace the wine version of lmjoin.h by an extended version that includes NetJoinDomain and NetUnjoinDomain. --- sdk/include/psdk/lmjoin.h | 69 ++++++++++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/sdk/include/psdk/lmjoin.h b/sdk/include/psdk/lmjoin.h index c1e7810f44f..b5da9a87e6c 100644 --- a/sdk/include/psdk/lmjoin.h +++ b/sdk/include/psdk/lmjoin.h @@ -1,29 +1,11 @@ -/* - * Copyright 2005 Ulrich Czekalla (For CodeWeavers) - * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __WINE_LMJOIN_H -#define __WINE_LMJOIN_H +#ifndef _LMJOIN_H +#define _LMJOIN_H #ifdef __cplusplus extern "C" { #endif -typedef enum tagNETSETUP_JOIN_STATUS +typedef enum _NETSETUP_JOIN_STATUS { NetSetupUnknownStatus = 0, NetSetupUnjoined, @@ -31,10 +13,47 @@ typedef enum tagNETSETUP_JOIN_STATUS NetSetupDomainName } NETSETUP_JOIN_STATUS, *PNETSETUP_JOIN_STATUS; -NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation( - LPCWSTR Server, - LPWSTR *Name, - PNETSETUP_JOIN_STATUS type); +#define NETSETUP_JOIN_DOMAIN 0x00000001 +#define NETSETUP_ACCT_CREATE 0x00000002 +#define NETSETUP_ACCT_DELETE 0x00000004 +#define NETSETUP_WIN9X_UPGRADE 0x00000010 +#define NETSETUP_DOMAIN_JOIN_IF_JOINED 0x00000020 +#define NETSETUP_JOIN_UNSECURE 0x00000040 +#define NETSETUP_MACHINE_PWD_PASSED 0x00000080 +#define NETSETUP_DEFER_SPN_SET 0x00000100 +#define NETSETUP_JOIN_DC_ACCOUNT 0x00000200 +#define NETSETUP_JOIN_WITH_NEW_NAME 0x00000400 +#define NETSETUP_INSTALL_INVOCATION 0x00040000 +#define NETSETUP_IGNORE_UNSUPPORTED_FLAGS 0x10000000 + +#define NETSETUP_VALID_UNJOIN_FLAGS (NETSETUP_ACCT_DELETE | \ + NETSETUP_JOIN_DC_ACCOUNT | \ + NETSETUP_IGNORE_UNSUPPORTED_FLAGS) + +NET_API_STATUS +NET_API_FUNCTION +NetJoinDomain( + _In_opt_ LPCWSTR lpServer, + _In_ LPCWSTR lpDomain, + _In_opt_ LPCWSTR lpAccountOU, + _In_opt_ LPCWSTR lpAccount, + _In_opt_ LPCWSTR lpPassword, + _In_ DWORD fJoinOptions); + +NET_API_STATUS +NET_API_FUNCTION +NetUnjoinDomain( + _In_opt_ LPCWSTR lpServer, + _In_opt_ LPCWSTR lpAccount, + _In_opt_ LPCWSTR lpPassword, + _In_ DWORD fUnjoinOptions); + +NET_API_STATUS +NET_API_FUNCTION +NetGetJoinInformation( + _In_opt_ LPCWSTR lpServer, + _Out_opt_ LPWSTR *lpNameBuffer, + _Out_ PNETSETUP_JOIN_STATUS BufferType); #ifdef __cplusplus }

1 0

[reactos] 01/01: [SHELL32] Fix hung-up of shell32:shlfileop (#2136)
by Katayama Hirofumi MZ 07 Dec '19

07 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=257e7307b4fb4de43b4c5… commit 257e7307b4fb4de43b4c50e4700b6ef52d0f653e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 8 07:58:14 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 8 07:58:14 2019 +0900 [SHELL32] Fix hung-up of shell32:shlfileop (#2136) #2085 caused some failures and hung-up in shell32:shlfileop testcase. This PR will fix it. CORE-16546 --- dll/win32/shell32/shlfileop.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index e7f53fcd448..9c20be4a6c1 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -1811,6 +1811,18 @@ static void check_flags(FILEOP_FLAGS fFlags) } #ifdef __REACTOS__ + +/* Error codes could be pre-Win32 */ +#define DE_SAMEFILE 0x71 +#define DE_MANYSRC1DEST 0x72 +#define DE_DIFFDIR 0x73 +#define DE_OPCANCELLED 0x75 +#define DE_DESTSUBTREE 0x76 +#define DE_INVALIDFILES 0x7C +#define DE_DESTSAMETREE 0x7D +#define DE_FLDDESTISFILE 0x7E +#define DE_FILEDESTISFLD 0x80 + static DWORD validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flTo) { @@ -1821,7 +1833,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT UINT wFunc = lpFileOp->wFunc; HWND hwnd = lpFileOp->hwnd; - dwNumDest = ((lpFileOp->fFlags & FOF_MULTIDESTFILES) ? flTo->dwNumFiles : 1); + dwNumDest = flTo->dwNumFiles; if (wFunc != FO_COPY && wFunc != FO_MOVE) return ERROR_SUCCESS; @@ -1844,7 +1856,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT if (lstrcmpiW(szFrom, szTo) == 0 && (wFunc == FO_MOVE || !(lpFileOp->fFlags & FOF_RENAMEONCOLLISION))) { - if (!(lpFileOp->fFlags & FOF_SILENT)) + if (!(lpFileOp->fFlags & (FOF_NOERRORUI | FOF_SILENT))) { if (wFunc == FO_MOVE) { @@ -1861,7 +1873,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT MessageBoxW(hwnd, szText, strTitle, MB_ICONERROR); } } - return ERROR_SHARING_VIOLATION; + return DE_OPCANCELLED; } // subfolder? @@ -1878,7 +1890,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT if (compare == 0) { - if (!(lpFileOp->fFlags & FOF_SILENT)) + if (!(lpFileOp->fFlags & (FOF_NOERRORUI | FOF_SILENT))) { if (wFunc == FO_MOVE) { @@ -1895,7 +1907,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT MessageBoxW(hwnd, szText, strTitle, MB_ICONERROR); } } - return ERROR_SHARING_VIOLATION; + return ERROR_SUCCESS; } } }

1 0

[reactos] 01/01: [CONSRV] Speed up console txt output CORE-16187
by Joachim Henze 07 Dec '19

07 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd149e8a1161a3ae86a09… commit bd149e8a1161a3ae86a09b940e5c4d2e029503b8 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Dec 7 18:35:06 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Dec 7 18:35:06 2019 +0100 [CONSRV] Speed up console txt output CORE-16187 By demoting good-path DPRINT1 to DPRINT. HBelusca agreed. The more important commit to solve CORE-16187 has been done beforehand in 0.4.14-dev-553-g 1dcdb4c2d0298ee71822c1d432a30604a82bbd21 --- win32ss/user/winsrv/consrv/conoutput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/winsrv/consrv/conoutput.c b/win32ss/user/winsrv/consrv/conoutput.c index 765216666e7..1a547696892 100644 --- a/win32ss/user/winsrv/consrv/conoutput.c +++ b/win32ss/user/winsrv/consrv/conoutput.c @@ -1032,7 +1032,7 @@ CSR_API(SrvSetConsoleWindowInfo) // PCONSOLE_SCREEN_BUFFER Buffer; PTEXTMODE_SCREEN_BUFFER Buffer; - DPRINT1("SrvSetConsoleWindowInfo(0x%08x, %d, {L%d, T%d, R%d, B%d}) called\n", + DPRINT("SrvSetConsoleWindowInfo(0x%08x, %d, {L%d, T%d, R%d, B%d}) called\n", SetWindowInfoRequest->OutputHandle, SetWindowInfoRequest->Absolute, SetWindowInfoRequest->WindowRect.Left , SetWindowInfoRequest->WindowRect.Top ,

1 0

[reactos] 01/01: [WSHOM_WINETEST] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 07 Dec '19

07 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22584b1c68d37ae53bc42… commit 22584b1c68d37ae53bc42894ab2132601ac44c27 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 7 13:12:15 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Dec 7 13:12:15 2019 +0100 [WSHOM_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/wshom/wshom.c | 71 +++++++++++++++++++++++++++++- modules/rostests/winetests/wshom/wshom.idl | 2 +- 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/modules/rostests/winetests/wshom/wshom.c b/modules/rostests/winetests/wshom/wshom.c index 18ff4d62281..c00f7abfa81 100644 --- a/modules/rostests/winetests/wshom/wshom.c +++ b/modules/rostests/winetests/wshom/wshom.c @@ -56,6 +56,13 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) ITypeInfo_Release(ti); } +#define CHECK_BSTR_LENGTH(str) check_bstr_length(str, __LINE__) +static void check_bstr_length(BSTR str, int line) +{ + ok_(__FILE__, line)(SysStringLen(str) == lstrlenW(str), "Unexpected string length %u vs %u.\n", + SysStringLen(str), lstrlenW(str)); +} + static void test_wshshell(void) { static const WCHAR notepadW[] = {'n','o','t','e','p','a','d','.','e','x','e',0}; @@ -66,6 +73,17 @@ static void test_wshshell(void) static const WCHAR path2W[] = {'P','A','T','H',0}; static const WCHAR dummydirW[] = {'d','e','a','d','p','a','r','r','o','t',0}; static const WCHAR emptyW[] = {'e','m','p','t','y',0}; + static const WCHAR cmdexeW[] = {'\\','c','m','d','.','e','x','e',0}; + static const WCHAR testdirW[] = {'w','s','h','o','m',' ','t','e','s','t',' ','d','i','r',0}; + static const WCHAR paramsW[] = + {' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\','n','o','s','u','c','h','d','i','r',0}; + static const WCHAR cmdW[] = + {'c','m','d','.','e','x','e',' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\', + 'n','o','s','u','c','h','d','i','r',0}; + static const WCHAR cmd2W[] = + {'"','c','m','d','.','e','x','e',' ','"',' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\', + 'n','o','s','u','c','h','d','i','r',0}; + WCHAR path[MAX_PATH], path2[MAX_PATH], buf[MAX_PATH]; IWshEnvironment *env; IWshExec *shexec; IWshShell3 *sh3; @@ -82,7 +100,7 @@ static void test_wshshell(void) EXCEPINFO ei; VARIANT arg, res, arg2; BSTR str, ret; - DWORD retval; + DWORD retval, attrs; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -145,6 +163,7 @@ static void test_wshshell(void) hr = IWshCollection_Item(coll, &arg, &res); EXPECT_HR(hr, S_OK); ok(V_VT(&res) == VT_BSTR, "got res type %d\n", V_VT(&res)); + CHECK_BSTR_LENGTH(V_BSTR(&res)); SysFreeString(str); VariantClear(&res); @@ -200,6 +219,7 @@ static void test_wshshell(void) hr = IWshEnvironment_get_Item(env, str, &ret); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ret && *ret == 0, "got %s\n", wine_dbgstr_w(ret)); + CHECK_BSTR_LENGTH(ret); SysFreeString(ret); SysFreeString(str); @@ -208,6 +228,7 @@ static void test_wshshell(void) hr = IWshEnvironment_get_Item(env, str, &ret); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ret && *ret != 0, "got %s\n", wine_dbgstr_w(ret)); + CHECK_BSTR_LENGTH(ret); SysFreeString(ret); SysFreeString(str); @@ -238,9 +259,53 @@ static void test_wshshell(void) hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); ok(retval == 10, "got %u\n", retval); + SysFreeString(str); + + V_VT(&arg2) = VT_BOOL; + V_BOOL(&arg2) = VARIANT_TRUE; + + retval = 0xdeadbeef; + str = SysAllocString(cmdW); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + SysFreeString(str); + + retval = 0xdeadbeef; + str = SysAllocString(cmd2W); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + SysFreeString(str); + GetSystemDirectoryW(path, ARRAY_SIZE(path)); + lstrcatW(path, cmdexeW); + attrs = GetFileAttributesW(path); + ok(attrs != INVALID_FILE_ATTRIBUTES, "cmd.exe not found\n"); + + /* copy cmd.exe to a path with spaces */ + GetTempPathW(ARRAY_SIZE(path2), path2); + lstrcatW(path2, testdirW); + CreateDirectoryW(path2, NULL); + lstrcatW(path2, cmdexeW); + CopyFileW(path, path2, FALSE); + + buf[0] = '"'; + lstrcpyW(buf + 1, path2); + buf[lstrlenW(buf)] = '"'; + lstrcpyW(buf + lstrlenW(path2) + 2, paramsW); + + retval = 0xdeadbeef; + str = SysAllocString(buf); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); SysFreeString(str); + DeleteFileW(path2); + path2[lstrlenW(path2) - lstrlenW(cmdexeW)] = 0; + RemoveDirectoryW(path2); + /* current directory */ if (0) /* crashes on native */ hr = IWshShell3_get_CurrentDirectory(sh3, NULL); @@ -249,6 +314,7 @@ static void test_wshshell(void) hr = IWshShell3_get_CurrentDirectory(sh3, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok(str && str[0] != 0, "got empty string\n"); + CHECK_BSTR_LENGTH(str); SysFreeString(str); hr = IWshShell3_put_CurrentDirectory(sh3, NULL); @@ -385,6 +451,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(!lstrcmpW(V_BSTR(&value), foobarW), "got %s\n", wine_dbgstr_w(V_BSTR(&value))); + CHECK_BSTR_LENGTH(V_BSTR(&value)); VariantClear(&value); SysFreeString(name); @@ -397,6 +464,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(SysStringLen(V_BSTR(&value)) == 6, "len %d\n", SysStringLen(V_BSTR(&value))); + CHECK_BSTR_LENGTH(V_BSTR(&value)); VariantClear(&value); SysFreeString(name); @@ -473,6 +541,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), fooW), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + CHECK_BSTR_LENGTH(V_BSTR(&v)); VariantClear(&v); VariantClear(&value); diff --git a/modules/rostests/winetests/wshom/wshom.idl b/modules/rostests/winetests/wshom/wshom.idl index 039938c82b0..00391d52838 100644 --- a/modules/rostests/winetests/wshom/wshom.idl +++ b/modules/rostests/winetests/wshom/wshom.idl @@ -383,7 +383,7 @@ library IWshRuntimeLibrary HRESULT length([out, retval] long *out_Count); [id(DISPID_NEWENUM)] - HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); } [

1 0

[reactos] 01/01: [WSHOM.OCX] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 07 Dec '19

07 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e3284089bb8c0a734006… commit 8e3284089bb8c0a734006329bd6ebd6c86b2b416 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 7 13:11:52 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Dec 7 13:11:52 2019 +0100 [WSHOM.OCX] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/wshom.ocx/shell.c | 92 ++++++++++++++++++++++++++++++------------- dll/win32/wshom.ocx/wshom.idl | 2 +- media/doc/README.WINE | 2 +- 3 files changed, 66 insertions(+), 30 deletions(-) diff --git a/dll/win32/wshom.ocx/shell.c b/dll/win32/wshom.ocx/shell.c index 42310e2a7e1..49f1771ab20 100644 --- a/dll/win32/wshom.ocx/shell.c +++ b/dll/win32/wshom.ocx/shell.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef __REACTOS__ +#include <wchar.h> +#endif + #include "wshom_private.h" #include "wshom.h" @@ -25,7 +29,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); @@ -455,14 +458,16 @@ static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, return E_POINTER; len = GetEnvironmentVariableW(name, NULL, 0); - *value = SysAllocStringLen(NULL, len); - if (!*value) - return E_OUTOFMEMORY; - if (len) - GetEnvironmentVariableW(name, *value, len+1); + { + *value = SysAllocStringLen(NULL, len - 1); + if (*value) + GetEnvironmentVariableW(name, *value, len); + } + else + *value = SysAllocStringLen(NULL, 0); - return S_OK; + return *value ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI WshEnvironment_put_Item(IWshEnvironment *iface, BSTR name, BSTR value) @@ -654,11 +659,11 @@ static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, } folder = V_BSTR(index); - if (!strcmpiW(folder, desktopW)) + if (!wcsicmp(folder, desktopW)) kind = CSIDL_DESKTOP; - else if (!strcmpiW(folder, allusersdesktopW)) + else if (!wcsicmp(folder, allusersdesktopW)) kind = CSIDL_COMMON_DESKTOPDIRECTORY; - else if (!strcmpiW(folder, allusersprogramsW)) + else if (!wcsicmp(folder, allusersprogramsW)) kind = CSIDL_COMMON_PROGRAMS; else { @@ -697,7 +702,7 @@ static HRESULT WINAPI WshCollection_get_length(IWshCollection *iface, LONG *coun return E_NOTIMPL; } -static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown *Enum) +static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown **Enum) { WshCollection *This = impl_from_IWshCollection(iface); FIXME("(%p)->(%p): stub\n", This, Enum); @@ -921,7 +926,7 @@ static HRESULT WINAPI WshShortcut_get_IconLocation(IWshShortcut *iface, BSTR *Ic hr = IShellLinkW_GetIconLocation(This->link, buffW, ARRAY_SIZE(buffW), &icon); if (FAILED(hr)) return hr; - sprintfW(pathW, fmtW, buffW, icon); + swprintf(pathW, fmtW, buffW, icon); *IconPath = SysAllocString(pathW); if (!*IconPath) return E_OUTOFMEMORY; @@ -939,7 +944,7 @@ static HRESULT WINAPI WshShortcut_put_IconLocation(IWshShortcut *iface, BSTR Ico TRACE("(%p)->(%s)\n", This, debugstr_w(IconPath)); /* scan for icon id */ - ptr = strrchrW(IconPath, ','); + ptr = wcsrchr(IconPath, ','); if (!ptr) { WARN("icon index not found\n"); @@ -949,10 +954,10 @@ static HRESULT WINAPI WshShortcut_put_IconLocation(IWshShortcut *iface, BSTR Ico path = SysAllocStringLen(IconPath, ptr-IconPath); /* skip spaces if any */ - while (isspaceW(*++ptr)) + while (iswspace(*++ptr)) ; - icon = atoiW(ptr); + icon = wcstol(ptr, NULL, 10); hr = IShellLinkW_SetIconLocation(This->link, path, icon); SysFreeString(path); @@ -1218,12 +1223,37 @@ static inline BOOL is_optional_argument(const VARIANT *arg) return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; } +static WCHAR *split_command( BSTR cmd, WCHAR **params ) +{ + WCHAR *ret, *ptr; + BOOL in_quotes = FALSE; + + if (!(ret = heap_alloc((lstrlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; + lstrcpyW( ret, cmd ); + + *params = NULL; + for (ptr = ret; *ptr; ptr++) + { + if (*ptr == '"') in_quotes = !in_quotes; + else if (*ptr == ' ' && !in_quotes) + { + *ptr = 0; + *params = ptr + 1; + break; + } + } + + return ret; +} + static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, DWORD *exit_code) { SHELLEXECUTEINFOW info; int waitforprocess; + WCHAR *file, *params; VARIANT s; HRESULT hr; + BOOL ret; TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(wait), exit_code); @@ -1251,13 +1281,18 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, waitforprocess = V_I4(&w); } + if (!(file = split_command(cmd, &params))) return E_OUTOFMEMORY; + memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; - info.lpFile = cmd; + info.lpFile = file; + info.lpParameters = params; info.nShow = V_I4(&s); - if (!ShellExecuteExW(&info)) + ret = ShellExecuteExW(&info); + heap_free( file ); + if (!ret) { TRACE("ShellExecute failed, %d\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); @@ -1266,6 +1301,7 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, { if (waitforprocess) { + WaitForSingleObject(info.hProcess, INFINITE); GetExitCodeProcess(info.hProcess, exit_code); CloseHandle(info.hProcess); } @@ -1409,9 +1445,9 @@ static HKEY get_root_key(const WCHAR *path) int i; for (i = 0; i < ARRAY_SIZE(rootkeys); i++) { - if (!strncmpW(path, rootkeys[i].full, strlenW(rootkeys[i].full))) + if (!wcsncmp(path, rootkeys[i].full, lstrlenW(rootkeys[i].full))) return rootkeys[i].hkey; - if (rootkeys[i].abbrev[0] && !strncmpW(path, rootkeys[i].abbrev, strlenW(rootkeys[i].abbrev))) + if (rootkeys[i].abbrev[0] && !wcsncmp(path, rootkeys[i].abbrev, lstrlenW(rootkeys[i].abbrev))) return rootkeys[i].hkey; } @@ -1424,17 +1460,17 @@ static HRESULT split_reg_path(const WCHAR *path, WCHAR **subkey, WCHAR **value) *value = NULL; /* at least one separator should be present */ - *subkey = strchrW(path, '\\'); + *subkey = wcschr(path, '\\'); if (!*subkey) return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); /* default value or not */ - if ((*subkey)[strlenW(*subkey)-1] == '\\') { + if ((*subkey)[lstrlenW(*subkey)-1] == '\\') { (*subkey)++; *value = NULL; } else { - *value = strrchrW(*subkey, '\\'); + *value = wcsrchr(*subkey, '\\'); if (*value - *subkey > 1) { unsigned int len = *value - *subkey - 1; WCHAR *ret; @@ -1546,7 +1582,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v bound.cElements = 0; while (*ptr) { bound.cElements++; - ptr += strlenW(ptr)+1; + ptr += lstrlenW(ptr)+1; } sa = SafeArrayCreate(VT_VARIANT, 1, &bound); @@ -1563,7 +1599,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v while (*ptr) { V_VT(v) = VT_BSTR; V_BSTR(v) = SysAllocString(ptr); - ptr += strlenW(ptr)+1; + ptr += lstrlenW(ptr)+1; v++; } @@ -1621,13 +1657,13 @@ static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT * if (V_VT(type) != VT_BSTR) return E_INVALIDARG; - if (!strcmpW(V_BSTR(type), regszW)) + if (!wcscmp(V_BSTR(type), regszW)) regtype = REG_SZ; - else if (!strcmpW(V_BSTR(type), regdwordW)) + else if (!wcscmp(V_BSTR(type), regdwordW)) regtype = REG_DWORD; - else if (!strcmpW(V_BSTR(type), regexpandszW)) + else if (!wcscmp(V_BSTR(type), regexpandszW)) regtype = REG_EXPAND_SZ; - else if (!strcmpW(V_BSTR(type), regbinaryW)) + else if (!wcscmp(V_BSTR(type), regbinaryW)) regtype = REG_BINARY; else { FIXME("unrecognized value type %s\n", debugstr_w(V_BSTR(type))); diff --git a/dll/win32/wshom.ocx/wshom.idl b/dll/win32/wshom.ocx/wshom.idl index d9367215890..8d4a8f03e17 100644 --- a/dll/win32/wshom.ocx/wshom.idl +++ b/dll/win32/wshom.ocx/wshom.idl @@ -383,7 +383,7 @@ library IWshRuntimeLibrary HRESULT length([out, retval] long *out_Count); [id(DISPID_NEWENUM)] - HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); } [ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 457cc108b44..87a6b8c92ff 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -212,7 +212,7 @@ dll/win32/wldap32 # Synced to WineStaging-4.18 dll/win32/wmi # Synced to WineStaging-2.9 dll/win32/wmiutils # Synced to WineStaging-4.18 dll/win32/wmvcore # Synced to WineStaging-4.18 -dll/win32/wshom.ocx # Synced to WineStaging-3.3 +dll/win32/wshom.ocx # Synced to WineStaging-4.18 dll/win32/wtsapi32 # Synced to WineStaging-3.9 dll/win32/wuapi # Synced to WineStaging-3.3 dll/win32/xinput1_1 # Synced to WineStaging-2.9

1 0

[reactos] 01/01: [WMVCORE_WINETEST] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 07 Dec '19

07 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebaf247c9e9910ec44d67… commit ebaf247c9e9910ec44d674bb57aecc3efb885256 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 7 13:11:29 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Dec 7 13:11:29 2019 +0100 [WMVCORE_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/wmvcore/wmvcore.c | 110 ++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 1 deletion(-) diff --git a/modules/rostests/winetests/wmvcore/wmvcore.c b/modules/rostests/winetests/wmvcore/wmvcore.c index b11a5bf7dea..8af34e22b6b 100644 --- a/modules/rostests/winetests/wmvcore/wmvcore.c +++ b/modules/rostests/winetests/wmvcore/wmvcore.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +19,7 @@ #define COBJMACROS #define WIN32_LEAN_AND_MEAN #include "initguid.h" -#include "wmsdkidl.h" +#include "wmsdk.h" #include "wine/test.h" @@ -201,6 +202,91 @@ static void test_wmreader_interfaces(void) IWMReader_Release(reader); } +static void test_wmsyncreader_interfaces(void) +{ + HRESULT hr; + IWMSyncReader *reader; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + IWMProfile *profile; + IWMProfile2 *profile2; + IWMProfile3 *profile3; + IWMPacketSize *packet; + IWMPacketSize2 *packet2; + IWMReaderTimecode *timecode; + IWMReaderPlaylistBurn *playlist; + IWMLanguageList *langlist; + + hr = WMCreateSyncReader( NULL, 0, &reader ); + ok(hr == S_OK, "WMCreateSyncReader failed 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("Failed to create IWMSyncReader\n"); + return; + } + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo, (void **)&header); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo2, (void **)&header2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo3, (void **)&header3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile2, (void **)&profile2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile3, (void **)&profile3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMLanguageList, (void **)&langlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(packet) + IWMPacketSize_Release(packet); + if(packet2) + IWMPacketSize2_Release(packet2); + if(profile) + IWMProfile_Release(profile); + if(profile2) + IWMProfile2_Release(profile2); + if(profile3) + IWMProfile3_Release(profile3); + if(header) + IWMHeaderInfo_Release(header); + if(header2) + IWMHeaderInfo2_Release(header2); + if(header3) + IWMHeaderInfo3_Release(header3); + if(timecode) + IWMReaderTimecode_Release(timecode); + if(playlist) + IWMReaderPlaylistBurn_Release(playlist); + if(langlist) + IWMLanguageList_Release(langlist); + + + IWMSyncReader_Release(reader); +} + + static void test_profile_manager_interfaces(void) { HRESULT hr; @@ -232,6 +318,26 @@ static void test_WMCreateWriterPriv(void) IWMWriter_Release(writer2); } +static void test_urlextension(void) +{ + HRESULT hr; + const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; + const WCHAR mkvfile[] = {'t','e','s','t','.','m','k','v',0}; + const WCHAR urlfile[] = {'a','b','c','d',':','/','/','t','e','s','t','/','t','e','s','t','.','w','m','v',0}; + const WCHAR testurl[] = {'h','t','t','p',':','/','/','t','e','s','t','/','t','.','a','s','f','?','a','l','t','=','t','.','m','k','v',0}; + + hr = WMCheckURLExtension(NULL); + ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(mkvfile); + ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(mp3file); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(urlfile); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(testurl); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); +} + START_TEST(wmvcore) { HRESULT hr; @@ -242,9 +348,11 @@ START_TEST(wmvcore) return; test_wmreader_interfaces(); + test_wmsyncreader_interfaces(); test_wmwriter_interfaces(); test_profile_manager_interfaces(); test_WMCreateWriterPriv(); + test_urlextension(); CoUninitialize(); }

1 0

[reactos] 01/01: [WMVCORE] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 07 Dec '19

07 Dec '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c3b31ddcccd900a651e5… commit 7c3b31ddcccd900a651e53d063feddb934530e69 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 7 13:11:07 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Dec 7 13:11:07 2019 +0100 [WMVCORE] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/wmvcore/CMakeLists.txt | 1 + dll/win32/wmvcore/{wmvcore_main.c => reader.c} | 287 ++-- dll/win32/wmvcore/wmvcore.spec | 8 +- dll/win32/wmvcore/wmvcore_main.c | 2131 +----------------------- media/doc/README.WINE | 2 +- 5 files changed, 254 insertions(+), 2175 deletions(-) diff --git a/dll/win32/wmvcore/CMakeLists.txt b/dll/win32/wmvcore/CMakeLists.txt index a89df2a3b61..09cc647fc2a 100644 --- a/dll/win32/wmvcore/CMakeLists.txt +++ b/dll/win32/wmvcore/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(wmvcore.dll wmvcore.spec ADD_IMPORTLIB) list(APPEND SOURCE + reader.c wmvcore_main.c writer.c ${CMAKE_CURRENT_BINARY_DIR}/wmvcore_stubs.c diff --git a/dll/win32/wmvcore/wmvcore_main.c b/dll/win32/wmvcore/reader.c similarity index 90% copy from dll/win32/wmvcore/wmvcore_main.c copy to dll/win32/wmvcore/reader.c index 690885e8612..6041c567e95 100644 --- a/dll/win32/wmvcore/wmvcore_main.c +++ b/dll/win32/wmvcore/reader.c @@ -18,52 +18,12 @@ #include "wmvcore.h" -#include "initguid.h" #include "wmsdk.h" #include "wine/debug.h" #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - -HRESULT WINAPI DllRegisterServer(void) -{ - FIXME("(): stub\n"); - - return S_OK; -} - -HRESULT WINAPI WMCheckURLScheme(const WCHAR *scheme) -{ - FIXME("(%s): stub\n", wine_dbgstr_w(scheme)); - - return NS_E_INVALID_NAME; -} - -HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) -{ - FIXME("(%p): stub\n", editor); - - *editor = NULL; - - return E_NOTIMPL; -} - typedef struct { IWMReader IWMReader_iface; IWMReaderAdvanced6 IWMReaderAdvanced6_iface; @@ -2103,38 +2063,29 @@ HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader) return WMCreateReader(NULL, 0, ret_reader); } -HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) -{ - FIXME("(%p, %x, %p): stub\n", pcert, rights, syncreader); - - *syncreader = NULL; - - return E_NOTIMPL; -} - typedef struct { - IWMProfileManager IWMProfileManager_iface; + IWMSyncReader IWMSyncReader_iface; LONG ref; -} WMProfileManager; +} WMSyncReader; -static inline WMProfileManager *impl_from_IWMProfileManager(IWMProfileManager *iface) +static inline WMSyncReader *impl_from_IWMSyncReader(IWMSyncReader *iface) { - return CONTAINING_RECORD(iface, WMProfileManager, IWMProfileManager_iface); + return CONTAINING_RECORD(iface, WMSyncReader, IWMSyncReader_iface); } -static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WMSyncReader_QueryInterface(IWMSyncReader *iface, REFIID riid, void **ppv) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMSyncReader *This = impl_from_IWMSyncReader(iface); - if(IsEqualGUID(&IID_IUnknown, riid)) { + if(IsEqualGUID(riid, &IID_IUnknown)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IWMProfileManager_iface; - }else if(IsEqualGUID(&IID_IWMProfileManager, riid)) { - TRACE("(%p)->(IID_IWMProfileManager %p)\n", This, ppv); - *ppv = &This->IWMProfileManager_iface; + *ppv = &This->IWMSyncReader_iface; + }else if(IsEqualGUID(riid, &IID_IWMSyncReader)) { + TRACE("(%p)->(IID_IWMSyncReader %p)\n", This, ppv); + *ppv = &This->IWMSyncReader_iface; }else { - FIXME("Unsupported iface %s\n", debugstr_guid(riid)); *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; } @@ -2142,9 +2093,9 @@ static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, return S_OK; } -static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) +static ULONG WINAPI WMSyncReader_AddRef(IWMSyncReader *iface) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMSyncReader *This = impl_from_IWMSyncReader(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -2152,9 +2103,9 @@ static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) return ref; } -static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) +static ULONG WINAPI WMSyncReader_Release(IWMSyncReader *iface) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMSyncReader *This = impl_from_IWMSyncReader(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -2165,73 +2116,207 @@ static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) return ref; } -static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager *iface, WMT_VERSION version, IWMProfile **ret) +static HRESULT WINAPI WMSyncReader_Close(IWMSyncReader *iface) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p): stub!\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetMaxOutputSampleSize(IWMSyncReader *iface, DWORD output, DWORD *max) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%d %p): stub!\n", This, output, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetMaxStreamSampleSize(IWMSyncReader *iface, WORD stream, DWORD *max) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); - FIXME("(%p)->(%x %p)\n", This, version, ret); + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%d %p): stub!\n", This, stream, max); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager *iface, REFGUID guid, IWMProfile **ret) +static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader *iface, WORD stream, INSSBuffer **sample, + QWORD *sample_time, QWORD *sample_duration, DWORD *flags, DWORD *output_num, WORD *stream_num) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(guid), ret); + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%d %p %p %p %p %p %p): stub!\n", This, stream, sample, sample_time, + sample_duration, flags, output_num, stream_num); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager *iface, const WCHAR *profile, IWMProfile **ret) +static HRESULT WINAPI WMSyncReader_GetOutputCount(IWMSyncReader *iface, DWORD *outputs) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(profile), ret); + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%p): stub!\n", This, outputs); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) +static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader *iface, DWORD output_num, DWORD format_num, + IWMOutputMediaProps **props) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); - FIXME("(%p)->(%p %p %p)\n", This, profile, profile_str, len); + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%u %u %p): stub!\n", This, output_num, format_num, props); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager *iface, DWORD *ret) +static HRESULT WINAPI WMSyncReader_GetOutputFormatCount(IWMSyncReader *iface, DWORD output_num, DWORD *formats) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); - FIXME("(%p)->(%p)\n", This, ret); + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%u %p): stub!\n", This, output_num, formats); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager *iface, DWORD index, IWMProfile **ret) +static HRESULT WINAPI WMSyncReader_GetOutputNumberForStream(IWMSyncReader *iface, WORD stream_num, DWORD *output_num) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); - FIXME("(%p)->(%d %p)\n", This, index, ret); + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%u %p): stub!\n", This, stream_num, output_num); return E_NOTIMPL; } -static const IWMProfileManagerVtbl WMProfileManagerVtbl = { - WMProfileManager_QueryInterface, - WMProfileManager_AddRef, - WMProfileManager_Release, - WMProfileManager_CreateEmptyProfile, - WMProfileManager_LoadProfileByID, - WMProfileManager_LoadProfileByData, - WMProfileManager_SaveProfile, - WMProfileManager_GetSystemProfileCount, - WMProfileManager_LoadSystemProfile +static HRESULT WINAPI WMSyncReader_GetOutputProps(IWMSyncReader *iface, DWORD output_num, IWMOutputMediaProps **output) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetOutputSetting(IWMSyncReader *iface, DWORD output_num, const WCHAR *name, + WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%u %s %p %p %p): stub!\n", This, output_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetReadStreamSamples(IWMSyncReader *iface, WORD stream_num, BOOL *compressed) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%d %p): stub!\n", This, stream_num, compressed); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_GetStreamNumberForOutput(IWMSyncReader *iface, DWORD output, WORD *stream_num) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%u %p): stub!\n", This, output, stream_num); + return S_OK; +} + +static HRESULT WINAPI WMSyncReader_GetStreamSelected(IWMSyncReader *iface, WORD stream_num, WMT_STREAM_SELECTION *selection) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%d %p): stub!\n", This, stream_num, selection); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_Open(IWMSyncReader *iface, const WCHAR *filename) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%s): stub!\n", This, debugstr_w(filename)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_OpenStream(IWMSyncReader *iface, IStream *stream) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%p): stub!\n", This, stream); + return S_OK; +} + +static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader *iface, DWORD output_num, IWMOutputMediaProps *output) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader *iface, DWORD output_num, const WCHAR *name, + WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%d %s %d %p %d): stub!\n", This, output_num, debugstr_w(name), type, value, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetRange(IWMSyncReader *iface, QWORD start, LONGLONG duration) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%s %s): stub!\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetRangeByFrame(IWMSyncReader *iface, WORD stream_num, QWORD frame_num, + LONGLONG frames) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%d %s %s): stub!\n", This, stream_num, wine_dbgstr_longlong(frame_num), wine_dbgstr_longlong(frames)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader *iface, WORD stream_num, BOOL compressed) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%u %x): stub!\n", This, stream_num, compressed); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader *iface, WORD stream_count, + WORD *stream_numbers, WMT_STREAM_SELECTION *selections) +{ + WMSyncReader *This = impl_from_IWMSyncReader(iface); + FIXME("(%p)->(%d %p %p): stub!\n", This, stream_count, stream_numbers, selections); + return S_OK; +} + +static const IWMSyncReaderVtbl WMSyncReaderVtbl = { + WMSyncReader_QueryInterface, + WMSyncReader_AddRef, + WMSyncReader_Release, + WMSyncReader_Open, + WMSyncReader_Close, + WMSyncReader_SetRange, + WMSyncReader_SetRangeByFrame, + WMSyncReader_GetNextSample, + WMSyncReader_SetStreamsSelected, + WMSyncReader_GetStreamSelected, + WMSyncReader_SetReadStreamSamples, + WMSyncReader_GetReadStreamSamples, + WMSyncReader_GetOutputSetting, + WMSyncReader_SetOutputSetting, + WMSyncReader_GetOutputCount, + WMSyncReader_GetOutputProps, + WMSyncReader_SetOutputProps, + WMSyncReader_GetOutputFormatCount, + WMSyncReader_GetOutputFormat, + WMSyncReader_GetOutputNumberForStream, + WMSyncReader_GetStreamNumberForOutput, + WMSyncReader_GetMaxOutputSampleSize, + WMSyncReader_GetMaxStreamSampleSize, + WMSyncReader_OpenStream }; -HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) +HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) { - WMProfileManager *profile_mgr; + WMSyncReader *sync; + + TRACE("(%p, %x, %p)\n", pcert, rights, syncreader); - TRACE("(%p)\n", ret); + sync = heap_alloc(sizeof(*sync)); - profile_mgr = heap_alloc(sizeof(*profile_mgr)); - if(!profile_mgr) + if (!sync) return E_OUTOFMEMORY; - profile_mgr->IWMProfileManager_iface.lpVtbl = &WMProfileManagerVtbl; - profile_mgr->ref = 1; + sync->IWMSyncReader_iface.lpVtbl = &WMSyncReaderVtbl; + sync->ref = 1; + + *syncreader = &sync->IWMSyncReader_iface; - *ret = &profile_mgr->IWMProfileManager_iface; return S_OK; } + +HRESULT WINAPI WMCreateSyncReaderPriv(IWMSyncReader **syncreader) +{ + return WMCreateSyncReader(NULL, 0, syncreader); +} diff --git a/dll/win32/wmvcore/wmvcore.spec b/dll/win32/wmvcore/wmvcore.spec index f3e3b641227..65e0807b61a 100644 --- a/dll/win32/wmvcore/wmvcore.spec +++ b/dll/win32/wmvcore/wmvcore.spec @@ -1,17 +1,17 @@ -@ stub WMCheckURLExtension +@ stdcall WMCheckURLExtension(wstr) @ stdcall WMCheckURLScheme(wstr) -@ stub WMCreateBackupRestorerPrivate -@ stub WMCreateSyncReaderPriv +@ stdcall WMCreateBackupRestorerPrivate(ptr ptr) WMCreateBackupRestorer @ stub WMIsAvailableOffline @ stub WMValidateData @ stdcall -private DllRegisterServer() -@ stub WMCreateBackupRestorer +@ stdcall WMCreateBackupRestorer(ptr ptr) @ stdcall WMCreateEditor(ptr) @ stub WMCreateIndexer @ stdcall WMCreateProfileManager(ptr) @ stdcall WMCreateReader(ptr long ptr) @ stdcall WMCreateReaderPriv(ptr) @ stdcall WMCreateSyncReader(ptr long ptr) +@ stdcall WMCreateSyncReaderPriv(ptr) @ stdcall WMCreateWriter(ptr ptr) @ stub WMCreateWriterFileSink @ stub WMCreateWriterNetworkSink diff --git a/dll/win32/wmvcore/wmvcore_main.c b/dll/win32/wmvcore/wmvcore_main.c index 690885e8612..af23ab88b8a 100644 --- a/dll/win32/wmvcore/wmvcore_main.c +++ b/dll/win32/wmvcore/wmvcore_main.c @@ -48,2090 +48,67 @@ HRESULT WINAPI DllRegisterServer(void) return S_OK; } -HRESULT WINAPI WMCheckURLScheme(const WCHAR *scheme) -{ - FIXME("(%s): stub\n", wine_dbgstr_w(scheme)); - - return NS_E_INVALID_NAME; -} - -HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) -{ - FIXME("(%p): stub\n", editor); - - *editor = NULL; - - return E_NOTIMPL; -} - -typedef struct { - IWMReader IWMReader_iface; - IWMReaderAdvanced6 IWMReaderAdvanced6_iface; - IWMReaderAccelerator IWMReaderAccelerator_iface; - IWMReaderNetworkConfig2 IWMReaderNetworkConfig2_iface; - IWMReaderStreamClock IWMReaderStreamClock_iface; - IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; - IWMReaderTimecode IWMReaderTimecode_iface; - IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; - IWMHeaderInfo3 IWMHeaderInfo3_iface; - IWMLanguageList IWMLanguageList_iface; - IReferenceClock IReferenceClock_iface; - IWMProfile3 IWMProfile3_iface; - IWMPacketSize2 IWMPacketSize2_iface; - LONG ref; -} WMReader; - -static inline WMReader *impl_from_IWMReader(IWMReader *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReader_iface); -} - -static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReader(iface); - - if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IWMReader_iface; - }else if(IsEqualGUID(riid, &IID_IWMReader)) { - TRACE("(%p)->(IID_IWMReader %p)\n", This, ppv); - *ppv = &This->IWMReader_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced)) { - TRACE("(%p)->(IID_IWMReaderAdvanced %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced2)) { - TRACE("(%p)->(IID_IWMReaderAdvanced2 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced3)) { - TRACE("(%p)->(IID_IWMReaderAdvanced3 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced4)) { - TRACE("(%p)->(IID_IWMReaderAdvanced4 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced5)) { - TRACE("(%p)->(IID_IWMReaderAdvanced5 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced6)) { - TRACE("(%p)->(IID_IWMReaderAdvanced6 %p)\n", This, ppv); - *ppv = &This->IWMReaderAdvanced6_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderAccelerator)) { - TRACE("(%p)->(IID_IWMReaderAccelerator %p)\n", This, ppv); - *ppv = &This->IWMReaderAccelerator_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderNetworkConfig)) { - TRACE("(%p)->(IWMReaderNetworkConfig %p)\n", This, ppv); - *ppv = &This->IWMReaderNetworkConfig2_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderNetworkConfig2)) { - TRACE("(%p)->(IWMReaderNetworkConfig2 %p)\n", This, ppv); - *ppv = &This->IWMReaderNetworkConfig2_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderStreamClock)) { - TRACE("(%p)->(IWMReaderStreamClock %p)\n", This, ppv); - *ppv = &This->IWMReaderStreamClock_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderTypeNegotiation)) { - TRACE("(%p)->(IWMReaderTypeNegotiation %p)\n", This, ppv); - *ppv = &This->IWMReaderTypeNegotiation_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderTimecode)) { - TRACE("(%p)->(IWMReaderTimecode %p)\n", This, ppv); - *ppv = &This->IWMReaderTimecode_iface; - }else if(IsEqualGUID(riid, &IID_IWMReaderPlaylistBurn)) { - TRACE("(%p)->(IWMReaderPlaylistBurn %p)\n", This, ppv); - *ppv = &This->IWMReaderPlaylistBurn_iface; - }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo)) { - TRACE("(%p)->(IWMHeaderInfo %p)\n", This, ppv); - *ppv = &This->IWMHeaderInfo3_iface; - }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo2)) { - TRACE("(%p)->(IWMHeaderInfo2 %p)\n", This, ppv); - *ppv = &This->IWMHeaderInfo3_iface; - }else if(IsEqualGUID(riid, &IID_IWMHeaderInfo3)) { - TRACE("(%p)->(IWMHeaderInfo3 %p)\n", This, ppv); - *ppv = &This->IWMHeaderInfo3_iface; - }else if(IsEqualGUID(riid, &IID_IWMLanguageList)) { - TRACE("(%p)->(IWMLanguageList %p)\n", This, ppv); - *ppv = &This->IWMLanguageList_iface; - }else if(IsEqualGUID(riid, &IID_IReferenceClock)) { - TRACE("(%p)->(IWMLanguageList %p)\n", This, ppv); - *ppv = &This->IReferenceClock_iface; - }else if(IsEqualGUID(riid, &IID_IWMProfile)) { - TRACE("(%p)->(IWMProfile %p)\n", This, ppv); - *ppv = &This->IWMProfile3_iface; - }else if(IsEqualGUID(riid, &IID_IWMProfile2)) { - TRACE("(%p)->(IWMProfile2 %p)\n", This, ppv); - *ppv = &This->IWMProfile3_iface; - }else if(IsEqualGUID(riid, &IID_IWMProfile3)) { - TRACE("(%p)->(IWMProfile3 %p)\n", This, ppv); - *ppv = &This->IWMProfile3_iface; - }else if(IsEqualGUID(riid, &IID_IWMPacketSize)) { - TRACE("(%p)->(IWMPacketSize %p)\n", This, ppv); - *ppv = &This->IWMPacketSize2_iface; - }else if(IsEqualGUID(riid, &IID_IWMPacketSize2)) { - TRACE("(%p)->(IWMPacketSize2 %p)\n", This, ppv); - *ppv = &This->IWMPacketSize2_iface; - }else { - *ppv = NULL; - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI WMReader_AddRef(IWMReader *iface) -{ - WMReader *This = impl_from_IWMReader(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; -} - -static ULONG WINAPI WMReader_Release(IWMReader *iface) -{ - WMReader *This = impl_from_IWMReader(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) - heap_free(This); - - return ref; -} - -static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReaderCallback *callback, void *context) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(url), callback, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_Close(IWMReader *iface) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%p)\n", This, outputs); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %p)\n", This, output_num, output); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps *output) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %p)\n", This, output_num, output); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output_num, DWORD *formats) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %p)\n", This, output_num, formats); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output_num, DWORD format_num, IWMOutputMediaProps **props) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %u %p)\n", This, output_num, format_num, props); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%s %s %f %p)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_Stop(IWMReader *iface) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_Pause(IWMReader *iface) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReader_Resume(IWMReader *iface) -{ - WMReader *This = impl_from_IWMReader(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static const IWMReaderVtbl WMReaderVtbl = { - WMReader_QueryInterface, - WMReader_AddRef, - WMReader_Release, - WMReader_Open, - WMReader_Close, - WMReader_GetOutputCount, - WMReader_GetOutputProps, - WMReader_SetOutputProps, - WMReader_GetOutputFormatCount, - WMReader_GetOutputFormat, - WMReader_Start, - WMReader_Stop, - WMReader_Pause, - WMReader_Resume -}; - -static inline WMReader *impl_from_IWMReaderAdvanced6(IWMReaderAdvanced6 *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderAdvanced6_iface); -} - -static HRESULT WINAPI WMReaderAdvanced_QueryInterface(IWMReaderAdvanced6 *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI WMReaderAdvanced_AddRef(IWMReaderAdvanced6 *iface) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI WMReaderAdvanced_Release(IWMReaderAdvanced6 *iface) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI WMReaderAdvanced_SetUserProvidedClock(IWMReaderAdvanced6 *iface, BOOL user_clock) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%x)\n", This, user_clock); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetUserProvidedClock(IWMReaderAdvanced6 *iface, BOOL *user_clock) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, user_clock); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_DeliverTime(IWMReaderAdvanced6 *iface, QWORD time) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(time)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetManualStreamSelection(IWMReaderAdvanced6 *iface, BOOL selection) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%x)\n", This, selection); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetManualStreamSelection(IWMReaderAdvanced6 *iface, BOOL *selection) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, selection); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetStreamsSelected(IWMReaderAdvanced6 *iface, WORD stream_count, - WORD *stream_numbers, WMT_STREAM_SELECTION *selections) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p %p)\n", This, stream_count, stream_numbers, selections); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetStreamSelected(IWMReaderAdvanced6 *iface, WORD stream_num, - WMT_STREAM_SELECTION *selection) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, stream_num, selection); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetReceiveSelectionCallbacks(IWMReaderAdvanced6 *iface, BOOL get_callbacks) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%x)\n", This, get_callbacks); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetReceiveSelectionCallbacks(IWMReaderAdvanced6 *iface, BOOL *get_callbacks) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, get_callbacks); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetReceiveStreamSamples(IWMReaderAdvanced6 *iface, WORD stream_num, - BOOL receive_stream_samples) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %x)\n", This, stream_num, receive_stream_samples); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetReceiveStreamSamples(IWMReaderAdvanced6 *iface, WORD stream_num, - BOOL *receive_stream_samples) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, stream_num, receive_stream_samples); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL allocate) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %x)\n", This, output_num, allocate); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL *allocate) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output_num, allocate); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetAllocateForStream(IWMReaderAdvanced6 *iface, WORD output_num, BOOL allocate) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %x)\n", This, output_num, allocate); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetAllocateForStream(IWMReaderAdvanced6 *iface, WORD output_num, BOOL *allocate) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output_num, allocate); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetStatistics(IWMReaderAdvanced6 *iface, WM_READER_STATISTICS *statistics) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, statistics); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_SetClientInfo(IWMReaderAdvanced6 *iface, WM_READER_CLIENTINFO *client_info) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, client_info); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetMaxOutputSampleSize(IWMReaderAdvanced6 *iface, DWORD output, DWORD *max) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output, max); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_GetMaxStreamSampleSize(IWMReaderAdvanced6 *iface, WORD stream, DWORD *max) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, stream, max); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced_NotifyLateDelivery(IWMReaderAdvanced6 *iface, QWORD lateness) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(lateness)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_SetPlayMode(IWMReaderAdvanced6 *iface, WMT_PLAY_MODE mode) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d)\n", This, mode); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetPlayMode(IWMReaderAdvanced6 *iface, WMT_PLAY_MODE *mode) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, mode); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetBufferProgress(IWMReaderAdvanced6 *iface, DWORD *percent, QWORD *buffering) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %p)\n", This, percent, buffering); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetDownloadProgress(IWMReaderAdvanced6 *iface, DWORD *percent, - QWORD *bytes_downloaded, QWORD *download) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %p %p)\n", This, percent, bytes_downloaded, download); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetSaveAsProgress(IWMReaderAdvanced6 *iface, DWORD *percent) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, percent); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_SaveFileAs(IWMReaderAdvanced6 *iface, const WCHAR *filename) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(filename)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetProtocolName(IWMReaderAdvanced6 *iface, WCHAR *protocol, DWORD *protocol_len) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %p)\n", This, protocol, protocol_len); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_StartAtMarker(IWMReaderAdvanced6 *iface, WORD marker_index, - QWORD duration, float rate, void *context) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %s %f %p)\n", This, marker_index, wine_dbgstr_longlong(duration), rate, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetOutputSetting(IWMReaderAdvanced6 *iface, DWORD output_num, - const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %s %p %p %p)\n", This, output_num, debugstr_w(name), type, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_SetOutputSetting(IWMReaderAdvanced6 *iface, DWORD output_num, - const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %s %d %p %d)\n", This, output_num, debugstr_w(name), type, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_Preroll(IWMReaderAdvanced6 *iface, QWORD start, QWORD duration, float rate) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%s %s %f)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_SetLogClientID(IWMReaderAdvanced6 *iface, BOOL log_client_id) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%x)\n", This, log_client_id); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_GetLogClientID(IWMReaderAdvanced6 *iface, BOOL *log_client_id) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, log_client_id); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_StopBuffering(IWMReaderAdvanced6 *iface) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, IStream *stream, - IWMReaderCallback *callback, void *context) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %p %p)\n", This, stream, callback, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced3_StopNetStreaming(IWMReaderAdvanced6 *iface) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced3_StartAtPosition(IWMReaderAdvanced6 *iface, WORD stream_num, - void *offset_start, void *duration, WMT_OFFSET_FORMAT format, float rate, void *context) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p %p %d %f %p)\n", This, stream_num, offset_start, duration, format, rate, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_GetLanguageCount(IWMReaderAdvanced6 *iface, DWORD output_num, WORD *language_count) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output_num, language_count); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_GetLanguage(IWMReaderAdvanced6 *iface, DWORD output_num, - WORD language, WCHAR *language_string, WORD *language_string_len) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %x %p %p)\n", This, output_num, language, language_string, language_string_len); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_GetMaxSpeedFactor(IWMReaderAdvanced6 *iface, double *factor) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, factor); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_IsUsingFastCache(IWMReaderAdvanced6 *iface, BOOL *using_fast_cache) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, using_fast_cache); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_AddLogParam(IWMReaderAdvanced6 *iface, const WCHAR *namespace, - const WCHAR *name, const WCHAR *value) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%s %s %s)\n", This, debugstr_w(namespace), debugstr_w(name), debugstr_w(value)); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_SendLogParams(IWMReaderAdvanced6 *iface) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_CanSaveFileAs(IWMReaderAdvanced6 *iface, BOOL *can_save) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p)\n", This, can_save); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_CancelSaveFileAs(IWMReaderAdvanced6 *iface) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced4_GetURL(IWMReaderAdvanced6 *iface, WCHAR *url, DWORD *url_len) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %p)\n", This, url, url_len); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced5_SetPlayerHook(IWMReaderAdvanced6 *iface, DWORD output_num, IWMPlayerHook *hook) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output_num, hook); - return E_NOTIMPL; -} - -static HRESULT WINAPI WMReaderAdvanced6_SetProtextStreamSamples(IWMReaderAdvanced6 *iface, BYTE *cert, - DWORD cert_size, DWORD cert_type, DWORD flags, BYTE *initialization_vector, DWORD *initialization_vector_size) -{ - WMReader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %d %d %x %p %p)\n", This, cert, cert_size, cert_type, flags, initialization_vector, - initialization_vector_size); - return E_NOTIMPL; -} - -static const IWMReaderAdvanced6Vtbl WMReaderAdvanced6Vtbl = { - WMReaderAdvanced_QueryInterface, - WMReaderAdvanced_AddRef, - WMReaderAdvanced_Release, - WMReaderAdvanced_SetUserProvidedClock, - WMReaderAdvanced_GetUserProvidedClock, - WMReaderAdvanced_DeliverTime, - WMReaderAdvanced_SetManualStreamSelection, - WMReaderAdvanced_GetManualStreamSelection, - WMReaderAdvanced_SetStreamsSelected, - WMReaderAdvanced_GetStreamSelected, - WMReaderAdvanced_SetReceiveSelectionCallbacks, - WMReaderAdvanced_GetReceiveSelectionCallbacks, - WMReaderAdvanced_SetReceiveStreamSamples, - WMReaderAdvanced_GetReceiveStreamSamples, - WMReaderAdvanced_SetAllocateForOutput, - WMReaderAdvanced_GetAllocateForOutput, - WMReaderAdvanced_SetAllocateForStream, - WMReaderAdvanced_GetAllocateForStream, - WMReaderAdvanced_GetStatistics, - WMReaderAdvanced_SetClientInfo, - WMReaderAdvanced_GetMaxOutputSampleSize, - WMReaderAdvanced_GetMaxStreamSampleSize, - WMReaderAdvanced_NotifyLateDelivery, - WMReaderAdvanced2_SetPlayMode, - WMReaderAdvanced2_GetPlayMode, - WMReaderAdvanced2_GetBufferProgress, - WMReaderAdvanced2_GetDownloadProgress, - WMReaderAdvanced2_GetSaveAsProgress, - WMReaderAdvanced2_SaveFileAs, - WMReaderAdvanced2_GetProtocolName, - WMReaderAdvanced2_StartAtMarker, - WMReaderAdvanced2_GetOutputSetting, - WMReaderAdvanced2_SetOutputSetting, - WMReaderAdvanced2_Preroll, - WMReaderAdvanced2_SetLogClientID, - WMReaderAdvanced2_GetLogClientID, - WMReaderAdvanced2_StopBuffering, - WMReaderAdvanced2_OpenStream, - WMReaderAdvanced3_StopNetStreaming, - WMReaderAdvanced3_StartAtPosition, - WMReaderAdvanced4_GetLanguageCount, - WMReaderAdvanced4_GetLanguage, - WMReaderAdvanced4_GetMaxSpeedFactor, - WMReaderAdvanced4_IsUsingFastCache, - WMReaderAdvanced4_AddLogParam, - WMReaderAdvanced4_SendLogParams, - WMReaderAdvanced4_CanSaveFileAs, - WMReaderAdvanced4_CancelSaveFileAs, - WMReaderAdvanced4_GetURL, - WMReaderAdvanced5_SetPlayerHook, - WMReaderAdvanced6_SetProtextStreamSamples -}; - -static inline WMReader *impl_from_IWMReaderAccelerator(IWMReaderAccelerator *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderAccelerator_iface); -} - -static HRESULT WINAPI reader_accl_QueryInterface(IWMReaderAccelerator *iface, REFIID riid, void **object) -{ - WMReader *This = impl_from_IWMReaderAccelerator(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, object); -} - -static ULONG WINAPI reader_accl_AddRef(IWMReaderAccelerator *iface) -{ - WMReader *This = impl_from_IWMReaderAccelerator(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI reader_accl_Release(IWMReaderAccelerator *iface) -{ - WMReader *This = impl_from_IWMReaderAccelerator(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI reader_accl_GetCodecInterface(IWMReaderAccelerator *iface, DWORD output, REFIID riid, void **codec) -{ - WMReader *This = impl_from_IWMReaderAccelerator(iface); - - FIXME("%p, %d, %s, %p\n", This, output, debugstr_guid(riid), codec); - - return E_NOTIMPL; -} - -static HRESULT WINAPI reader_accl_Notify(IWMReaderAccelerator *iface, DWORD output, WM_MEDIA_TYPE *subtype) -{ - WMReader *This = impl_from_IWMReaderAccelerator(iface); - - FIXME("%p, %d, %p\n", This, output, subtype); - - return E_NOTIMPL; -} - -static const IWMReaderAcceleratorVtbl WMReaderAcceleratorVtbl = { - reader_accl_QueryInterface, - reader_accl_AddRef, - reader_accl_Release, - reader_accl_GetCodecInterface, - reader_accl_Notify -}; - -static inline WMReader *impl_from_IWMReaderNetworkConfig2(IWMReaderNetworkConfig2 *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderNetworkConfig2_iface); -} - -static HRESULT WINAPI networkconfig_QueryInterface(IWMReaderNetworkConfig2 *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI networkconfig_AddRef(IWMReaderNetworkConfig2 *iface) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI networkconfig_Release(IWMReaderNetworkConfig2 *iface) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI networkconfig_GetBufferingTime(IWMReaderNetworkConfig2 *iface, QWORD *buffering_time) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, buffering_time); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetBufferingTime(IWMReaderNetworkConfig2 *iface, QWORD buffering_time) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s\n", This, wine_dbgstr_longlong(buffering_time)); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetUDPPortRanges(IWMReaderNetworkConfig2 *iface, WM_PORT_NUMBER_RANGE *array, - DWORD *ranges) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p, %p\n", This, array, ranges); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetUDPPortRanges(IWMReaderNetworkConfig2 *iface, WM_PORT_NUMBER_RANGE *array, - DWORD ranges) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p, %u\n", This, array, ranges); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetProxySettings(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - WMT_PROXY_SETTINGS *proxy) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %p\n", This, debugstr_w(protocol), proxy); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetProxySettings(IWMReaderNetworkConfig2 *iface, LPCWSTR protocol, - WMT_PROXY_SETTINGS proxy) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %d\n", This, debugstr_w(protocol), proxy); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetProxyHostName(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - WCHAR *hostname, DWORD *size) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %p, %p\n", This, debugstr_w(protocol), hostname, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetProxyHostName(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - const WCHAR *hostname) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %s\n", This, debugstr_w(protocol), debugstr_w(hostname)); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetProxyPort(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - DWORD *port) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %p\n", This, debugstr_w(protocol), port); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetProxyPort(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - DWORD port) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %u\n", This, debugstr_w(protocol), port); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetProxyExceptionList(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - WCHAR *exceptions, DWORD *count) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %p, %p\n", This, debugstr_w(protocol), exceptions, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetProxyExceptionList(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - const WCHAR *exceptions) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %s\n", This, debugstr_w(protocol), debugstr_w(exceptions)); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetProxyBypassForLocal(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - BOOL *bypass) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %p\n", This, debugstr_w(protocol), bypass); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetProxyBypassForLocal(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, - BOOL bypass) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %d\n", This, debugstr_w(protocol), bypass); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetForceRerunAutoProxyDetection(IWMReaderNetworkConfig2 *iface, - BOOL *detection) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, detection); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetForceRerunAutoProxyDetection(IWMReaderNetworkConfig2 *iface, - BOOL detection) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, detection); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableMulticast(IWMReaderNetworkConfig2 *iface, BOOL *multicast) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, multicast); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableMulticast(IWMReaderNetworkConfig2 *iface, BOOL multicast) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, multicast); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableHTTP(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableHTTP(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableUDP(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableUDP(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableTCP(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableTCP(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_ResetProtocolRollover(IWMReaderNetworkConfig2 *iface) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetConnectionBandwidth(IWMReaderNetworkConfig2 *iface, DWORD *bandwidth) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetConnectionBandwidth(IWMReaderNetworkConfig2 *iface, DWORD bandwidth) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetNumProtocolsSupported(IWMReaderNetworkConfig2 *iface, DWORD *protocols) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, protocols); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetSupportedProtocolName(IWMReaderNetworkConfig2 *iface, DWORD protocol_num, - WCHAR *protocol, DWORD *size) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u, %p %p\n", This, protocol_num, protocol, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_AddLoggingUrl(IWMReaderNetworkConfig2 *iface, const WCHAR *url) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s\n", This, debugstr_w(url)); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetLoggingUrl(IWMReaderNetworkConfig2 *iface, DWORD index, WCHAR *url, - DWORD *size) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u, %p, %p\n", This, index, url, size); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetLoggingUrlCount(IWMReaderNetworkConfig2 *iface, DWORD *count) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_ResetLoggingUrlList(IWMReaderNetworkConfig2 *iface) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableContentCaching(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableContentCaching(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableFastCache(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableFastCache(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %d\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetAcceleratedStreamingDuration(IWMReaderNetworkConfig2 *iface, - QWORD *duration) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, duration); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetAcceleratedStreamingDuration(IWMReaderNetworkConfig2 *iface, - QWORD duration) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s\n", This, wine_dbgstr_longlong(duration)); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetAutoReconnectLimit(IWMReaderNetworkConfig2 *iface, DWORD *limit) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, limit); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetAutoReconnectLimit(IWMReaderNetworkConfig2 *iface, DWORD limit) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u\n", This, limit); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableResends(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableResends(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetEnableThinning(IWMReaderNetworkConfig2 *iface, BOOL *enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_SetEnableThinning(IWMReaderNetworkConfig2 *iface, BOOL enable) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u\n", This, enable); - return E_NOTIMPL; -} - -static HRESULT WINAPI networkconfig_GetMaxNetPacketSize(IWMReaderNetworkConfig2 *iface, DWORD *packet_size) -{ - WMReader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p\n", This, packet_size); - return E_NOTIMPL; -} - -static const IWMReaderNetworkConfig2Vtbl WMReaderNetworkConfig2Vtbl = -{ - networkconfig_QueryInterface, - networkconfig_AddRef, - networkconfig_Release, - networkconfig_GetBufferingTime, - networkconfig_SetBufferingTime, - networkconfig_GetUDPPortRanges, - networkconfig_SetUDPPortRanges, - networkconfig_GetProxySettings, - networkconfig_SetProxySettings, - networkconfig_GetProxyHostName, - networkconfig_SetProxyHostName, - networkconfig_GetProxyPort, - networkconfig_SetProxyPort, - networkconfig_GetProxyExceptionList, - networkconfig_SetProxyExceptionList, - networkconfig_GetProxyBypassForLocal, - networkconfig_SetProxyBypassForLocal, - networkconfig_GetForceRerunAutoProxyDetection, - networkconfig_SetForceRerunAutoProxyDetection, - networkconfig_GetEnableMulticast, - networkconfig_SetEnableMulticast, - networkconfig_GetEnableHTTP, - networkconfig_SetEnableHTTP, - networkconfig_GetEnableUDP, - networkconfig_SetEnableUDP, - networkconfig_GetEnableTCP, - networkconfig_SetEnableTCP, - networkconfig_ResetProtocolRollover, - networkconfig_GetConnectionBandwidth, - networkconfig_SetConnectionBandwidth, - networkconfig_GetNumProtocolsSupported, - networkconfig_GetSupportedProtocolName, - networkconfig_AddLoggingUrl, - networkconfig_GetLoggingUrl, - networkconfig_GetLoggingUrlCount, - networkconfig_ResetLoggingUrlList, - networkconfig_GetEnableContentCaching, - networkconfig_SetEnableContentCaching, - networkconfig_GetEnableFastCache, - networkconfig_SetEnableFastCache, - networkconfig_GetAcceleratedStreamingDuration, - networkconfig_SetAcceleratedStreamingDuration, - networkconfig_GetAutoReconnectLimit, - networkconfig_SetAutoReconnectLimit, - networkconfig_GetEnableResends, - networkconfig_SetEnableResends, - networkconfig_GetEnableThinning, - networkconfig_SetEnableThinning, - networkconfig_GetMaxNetPacketSize -}; - -static inline WMReader *impl_from_IWMReaderStreamClock(IWMReaderStreamClock *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderStreamClock_iface); -} - -static HRESULT WINAPI readclock_QueryInterface(IWMReaderStreamClock *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReaderStreamClock(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI readclock_AddRef(IWMReaderStreamClock *iface) -{ - WMReader *This = impl_from_IWMReaderStreamClock(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI readclock_Release(IWMReaderStreamClock *iface) -{ - WMReader *This = impl_from_IWMReaderStreamClock(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI readclock_GetTime(IWMReaderStreamClock *iface, QWORD *now) -{ - WMReader *This = impl_from_IWMReaderStreamClock(iface); - FIXME("%p, %p\n", This, now); - return E_NOTIMPL; -} - -static HRESULT WINAPI readclock_SetTimer(IWMReaderStreamClock *iface, QWORD when, void *param, DWORD *id) -{ - WMReader *This = impl_from_IWMReaderStreamClock(iface); - FIXME("%p, %s, %p, %p\n", This, wine_dbgstr_longlong(when), param, id); - return E_NOTIMPL; -} - -static HRESULT WINAPI readclock_KillTimer(IWMReaderStreamClock *iface, DWORD id) -{ - WMReader *This = impl_from_IWMReaderStreamClock(iface); - FIXME("%p, %d\n", This, id); - return E_NOTIMPL; -} - -static const IWMReaderStreamClockVtbl WMReaderStreamClockVtbl = -{ - readclock_QueryInterface, - readclock_AddRef, - readclock_Release, - readclock_GetTime, - readclock_SetTimer, - readclock_KillTimer -}; - -static inline WMReader *impl_from_IWMReaderTypeNegotiation(IWMReaderTypeNegotiation *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderTypeNegotiation_iface); -} - -static HRESULT WINAPI negotiation_QueryInterface(IWMReaderTypeNegotiation *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI negotiation_AddRef(IWMReaderTypeNegotiation *iface) -{ - WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI negotiation_Release(IWMReaderTypeNegotiation *iface) -{ - WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI negotiation_TryOutputProps(IWMReaderTypeNegotiation *iface, DWORD output, IWMOutputMediaProps *props) -{ - WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); - FIXME("%p, %d, %p\n", This, output, props); - return E_NOTIMPL; -} - -static const IWMReaderTypeNegotiationVtbl WMReaderTypeNegotiationVtbl = -{ - negotiation_QueryInterface, - negotiation_AddRef, - negotiation_Release, - negotiation_TryOutputProps -}; - -static inline WMReader *impl_from_IWMReaderTimecode(IWMReaderTimecode *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderTimecode_iface); -} - -static HRESULT WINAPI timecode_QueryInterface(IWMReaderTimecode *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReaderTimecode(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI timecode_AddRef(IWMReaderTimecode *iface) -{ - WMReader *This = impl_from_IWMReaderTimecode(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI timecode_Release(IWMReaderTimecode *iface) -{ - WMReader *This = impl_from_IWMReaderTimecode(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI timecode_GetTimecodeRangeCount(IWMReaderTimecode *iface, WORD num, WORD *count) -{ - WMReader *This = impl_from_IWMReaderTimecode(iface); - FIXME("%p, %d, %p\n", This, num, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI timecode_GetTimecodeRangeBounds(IWMReaderTimecode *iface, WORD stream, WORD range, - DWORD *start_timecode, DWORD *end_timecode) -{ - WMReader *This = impl_from_IWMReaderTimecode(iface); - FIXME("%p, %d, %d, %p, %p\n", This, stream, range, start_timecode, end_timecode); - return E_NOTIMPL; -} - -static const IWMReaderTimecodeVtbl WMReaderTimecodeVtbl = -{ - timecode_QueryInterface, - timecode_AddRef, - timecode_Release, - timecode_GetTimecodeRangeCount, - timecode_GetTimecodeRangeBounds -}; - - -static inline WMReader *impl_from_IWMReaderPlaylistBurn(IWMReaderPlaylistBurn *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMReaderPlaylistBurn_iface); -} - -static HRESULT WINAPI playlist_QueryInterface(IWMReaderPlaylistBurn *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI playlist_AddRef(IWMReaderPlaylistBurn *iface) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI playlist_Release(IWMReaderPlaylistBurn *iface) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI playlist_InitPlaylistBurn(IWMReaderPlaylistBurn *iface, DWORD count, - LPCWSTR_WMSDK_TYPE_SAFE *filenames, IWMStatusCallback *callback, void *context) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - FIXME("%p, %d, %p, %p, %p\n", This, count, filenames, callback, context); - return E_NOTIMPL; -} - -static HRESULT WINAPI playlist_GetInitResults(IWMReaderPlaylistBurn *iface, DWORD count, HRESULT *stat) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - FIXME("%p, %d, %p\n", This, count, stat); - return E_NOTIMPL; -} - -static HRESULT WINAPI playlist_Cancel(IWMReaderPlaylistBurn *iface) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI playlist_EndPlaylistBurn(IWMReaderPlaylistBurn *iface, HRESULT result) -{ - WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); - FIXME("%p, 0x%08x\n", This, result); - return E_NOTIMPL; -} - -static const IWMReaderPlaylistBurnVtbl WMReaderPlaylistBurnVtbl = -{ - playlist_QueryInterface, - playlist_AddRef, - playlist_Release, - playlist_InitPlaylistBurn, - playlist_GetInitResults, - playlist_Cancel, - playlist_EndPlaylistBurn -}; - -static inline WMReader *impl_from_IWMHeaderInfo3(IWMHeaderInfo3 *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMHeaderInfo3_iface); -} - -static HRESULT WINAPI headerinfo_QueryInterface(IWMHeaderInfo3 *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI headerinfo_AddRef(IWMHeaderInfo3 *iface) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI headerinfo_Release(IWMHeaderInfo3 *iface) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI headerinfo_GetAttributeCount(IWMHeaderInfo3 *iface, WORD stream_num, WORD *attributes) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %p\n", This, stream_num, attributes); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetAttributeByIndex(IWMHeaderInfo3 *iface, WORD index, WORD *stream_num, - WCHAR *name, WORD *name_len, WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %p, %p, %p, %p, %p, %p\n", This, index, stream_num, name, name_len, type, - value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetAttributeByName(IWMHeaderInfo3 *iface, WORD *stream_num, LPCWSTR name, - WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %p, %s, %p, %p, %p\n", This, stream_num, debugstr_w(name), type, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_SetAttribute(IWMHeaderInfo3 *iface, WORD stream_num, LPCWSTR name, - WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %s, %d, %p, %d\n", This, stream_num, debugstr_w(name), type, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetMarkerCount(IWMHeaderInfo3 *iface, WORD *markers) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %p\n", This, markers); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetMarker(IWMHeaderInfo3 *iface, WORD index, WCHAR *marker_name, - WORD *marker_len, QWORD *marker_time) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %p, %p, %p\n", This, index, marker_name, marker_len, marker_time); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_AddMarker(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_TYPE_SAFE marker_name, - QWORD marker_time) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %p, %s\n", This, marker_name, wine_dbgstr_longlong(marker_time)); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_RemoveMarker(IWMHeaderInfo3 *iface, WORD index) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d\n", This, index); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetScriptCount(IWMHeaderInfo3 *iface, WORD *scripts) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %p\n", This, scripts); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetScript(IWMHeaderInfo3 *iface, WORD index, WCHAR *type, - WORD *type_len, WCHAR *command, WORD *command_len, QWORD *script_time) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %p, %p, %p, %p, %p\n", This, index, type, type_len, command, command_len, script_time); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_AddScript(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_TYPE_SAFE type, - LPCWSTR_WMSDK_TYPE_SAFE command, QWORD script_time) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %s, %s, %s\n", This, debugstr_w(type), debugstr_w(command), wine_dbgstr_longlong(script_time)); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_RemoveScript(IWMHeaderInfo3 *iface, WORD index) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d\n", This, index); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetCodecInfoCount(IWMHeaderInfo3 *iface, DWORD *codec_infos) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %p\n", This, codec_infos); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetCodecInfo(IWMHeaderInfo3 *iface, DWORD index, WORD *name_len, - WCHAR *name, WORD *description_len, WCHAR *description, WMT_CODEC_INFO_TYPE *codec_type, - WORD *codec_info_cnt, BYTE *codec_info) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %p, %p, %p, %p, %p, %p, %p\n", This, index, name_len, name, description_len, - description, codec_type, codec_info_cnt, codec_info); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetAttributeCountEx(IWMHeaderInfo3 *iface, WORD stream_num, WORD *attributes) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %p\n", This, stream_num, attributes); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetAttributeIndices(IWMHeaderInfo3 *iface, WORD stream_num, LPCWSTR name, - WORD *lang_index, WORD *indices, WORD *count) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %s, %p, %p, %p\n", This, stream_num, debugstr_w(name), lang_index, indices, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_GetAttributeByIndexEx(IWMHeaderInfo3 *iface, WORD stream_num, - WORD index, LPWSTR name, WORD *name_len, WMT_ATTR_DATATYPE *type, WORD *lang_index, - BYTE *value, DWORD *data_len) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %d, %s, %p, %p, %p, %p, %p\n", This, stream_num, index, debugstr_w(name), name_len, - type, lang_index, value, data_len); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_ModifyAttribute(IWMHeaderInfo3 *iface, WORD stream_num, - WORD index, WMT_ATTR_DATATYPE type, WORD lang_index, const BYTE *value, DWORD length) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %d, %d, %d, %p, %d\n", This, stream_num, index, type, lang_index, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_AddAttribute(IWMHeaderInfo3 *iface, WORD stream_num, LPCWSTR name, - WORD *index, WMT_ATTR_DATATYPE type, WORD lang_index, const BYTE *value, DWORD length) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %s, %p, %d, %d, %p, %d\n", This, stream_num, debugstr_w(name), index, - type, lang_index, value, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_DeleteAttribute(IWMHeaderInfo3 *iface, WORD stream_num, WORD index) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %d, %d\n", This, stream_num, index); - return E_NOTIMPL; -} - -static HRESULT WINAPI headerinfo_AddCodecInfo(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_TYPE_SAFE name, - LPCWSTR_WMSDK_TYPE_SAFE description, WMT_CODEC_INFO_TYPE codec_type, WORD codec_info_cnt, - BYTE *codec_info) -{ - WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %p, %p, %d, %d, %p\n", This, name, description, codec_type, codec_info_cnt, - codec_info); - return E_NOTIMPL; -} - -static const IWMHeaderInfo3Vtbl WMHeaderInfo3Vtbl = -{ - headerinfo_QueryInterface, - headerinfo_AddRef, - headerinfo_Release, - headerinfo_GetAttributeCount, - headerinfo_GetAttributeByIndex, - headerinfo_GetAttributeByName, - headerinfo_SetAttribute, - headerinfo_GetMarkerCount, - headerinfo_GetMarker, - headerinfo_AddMarker, - headerinfo_RemoveMarker, - headerinfo_GetScriptCount, - headerinfo_GetScript, - headerinfo_AddScript, - headerinfo_RemoveScript, - headerinfo_GetCodecInfoCount, - headerinfo_GetCodecInfo, - headerinfo_GetAttributeCountEx, - headerinfo_GetAttributeIndices, - headerinfo_GetAttributeByIndexEx, - headerinfo_ModifyAttribute, - headerinfo_AddAttribute, - headerinfo_DeleteAttribute, - headerinfo_AddCodecInfo -}; - - -static inline WMReader *impl_from_IWMLanguageList(IWMLanguageList *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMLanguageList_iface); -} - -static HRESULT WINAPI langlist_QueryInterface(IWMLanguageList *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMLanguageList(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI langlist_AddRef(IWMLanguageList *iface) -{ - WMReader *This = impl_from_IWMLanguageList(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI langlist_Release(IWMLanguageList *iface) -{ - WMReader *This = impl_from_IWMLanguageList(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI langlist_GetLanguageCount(IWMLanguageList *iface, WORD *count) -{ - WMReader *This = impl_from_IWMLanguageList(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI langlist_GetLanguageDetails(IWMLanguageList *iface, WORD index, - WCHAR *language, WORD *length) -{ - WMReader *This = impl_from_IWMLanguageList(iface); - FIXME("%p, %d, %p, %p\n", This, index, language, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI langlist_AddLanguageByRFC1766String(IWMLanguageList *iface, LPCWSTR_WMSDK_TYPE_SAFE language, - WORD *index) -{ - WMReader *This = impl_from_IWMLanguageList(iface); - FIXME("%p, %p, %p\n", This, language, index); - return E_NOTIMPL; -} - -static const IWMLanguageListVtbl WMLanguageListVtbl = -{ - langlist_QueryInterface, - langlist_AddRef, - langlist_Release, - langlist_GetLanguageCount, - langlist_GetLanguageDetails, - langlist_AddLanguageByRFC1766String -}; - -static inline WMReader *impl_from_IReferenceClock(IReferenceClock *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IReferenceClock_iface); -} - -static HRESULT WINAPI refclock_QueryInterface(IReferenceClock *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IReferenceClock(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI refclock_AddRef(IReferenceClock *iface) -{ - WMReader *This = impl_from_IReferenceClock(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI refclock_Release(IReferenceClock *iface) -{ - WMReader *This = impl_from_IReferenceClock(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI refclock_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) -{ - WMReader *This = impl_from_IReferenceClock(iface); - FIXME("%p, %p\n", This, time); - return E_NOTIMPL; -} - -static HRESULT WINAPI refclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME basetime, - REFERENCE_TIME streamtime, HEVENT event, DWORD_PTR *cookie) -{ - WMReader *This = impl_from_IReferenceClock(iface); - FIXME("%p, %s, %s, %lu, %p\n", This, wine_dbgstr_longlong(basetime), - wine_dbgstr_longlong(streamtime), event, cookie); - return E_NOTIMPL; -} - -static HRESULT WINAPI refclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_TIME starttime, - REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) -{ - WMReader *This = impl_from_IReferenceClock(iface); - FIXME("%p, %s, %s, %lu, %p\n", This, wine_dbgstr_longlong(starttime), - wine_dbgstr_longlong(period), semaphore, cookie); - return E_NOTIMPL; -} - -static HRESULT WINAPI refclock_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) -{ - WMReader *This = impl_from_IReferenceClock(iface); - FIXME("%p, %lu\n", This, cookie); - return E_NOTIMPL; -} - -static const IReferenceClockVtbl ReferenceClockVtbl = -{ - refclock_QueryInterface, - refclock_AddRef, - refclock_Release, - refclock_GetTime, - refclock_AdviseTime, - refclock_AdvisePeriodic, - refclock_Unadvise -}; - -static inline WMReader *impl_from_IWMProfile3(IWMProfile3 *iface) -{ - return CONTAINING_RECORD(iface, WMReader, IWMProfile3_iface); -} - -static HRESULT WINAPI profile3_QueryInterface(IWMProfile3 *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMProfile3(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} - -static ULONG WINAPI profile3_AddRef(IWMProfile3 *iface) -{ - WMReader *This = impl_from_IWMProfile3(iface); - return IWMReader_AddRef(&This->IWMReader_iface); -} - -static ULONG WINAPI profile3_Release(IWMProfile3 *iface) -{ - WMReader *This = impl_from_IWMProfile3(iface); - return IWMReader_Release(&This->IWMReader_iface); -} - -static HRESULT WINAPI profile3_GetVersion(IWMProfile3 *iface, WMT_VERSION *version) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, version); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetName(IWMProfile3 *iface, WCHAR *name, DWORD *length) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p, %p\n", This, name, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetName(IWMProfile3 *iface, const WCHAR *name) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s\n", This, debugstr_w(name)); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetDescription(IWMProfile3 *iface, WCHAR *description, DWORD *length) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p, %p\n", This, description, length); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetDescription(IWMProfile3 *iface, const WCHAR *description) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s\n", This, debugstr_w(description)); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStreamCount(IWMProfile3 *iface, DWORD *count) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, index, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStreamByNumber(IWMProfile3 *iface, WORD stream, IWMStreamConfig **config) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, stream, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveStream(IWMProfile3 *iface, IWMStreamConfig *config) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveStreamByNumber(IWMProfile3 *iface, WORD stream) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_AddStream(IWMProfile3 *iface, IWMStreamConfig *config) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_ReconfigStream(IWMProfile3 *iface, IWMStreamConfig *config) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewStream(IWMProfile3 *iface, REFGUID type, IWMStreamConfig **config) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(type), config); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetMutualExclusionCount(IWMProfile3 *iface, DWORD *count) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetMutualExclusion(IWMProfile3 *iface, DWORD index, IWMMutualExclusion **mutual) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, index, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_AddMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion *mutual) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewMutualExclusion(IWMProfile3 *iface, IWMMutualExclusion **mutual) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, mutual); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetProfileID(IWMProfile3 *iface, GUID *guid) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, guid); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT *storage) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, storage); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetStorageFormat(IWMProfile3 *iface, WMT_STORAGE_FORMAT storage) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d\n", This, storage); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetBandwidthSharingCount(IWMProfile3 *iface, DWORD *count) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetBandwidthSharing(IWMProfile3 *iface, DWORD index, IWMBandwidthSharing **bandwidth) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %d, %p\n", This, index, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing *bandwidth) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_AddBandwidthSharing(IWMProfile3 *iface, IWMBandwidthSharing *bandwidth) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewBandwidthSharing( IWMProfile3 *iface, IWMBandwidthSharing **bandwidth) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, bandwidth); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_SetStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization *stream) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_RemoveStreamPrioritization(IWMProfile3 *iface) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_CreateNewStreamPrioritization(IWMProfile3 *iface, IWMStreamPrioritization **stream) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %p\n", This, stream); - return E_NOTIMPL; -} - -static HRESULT WINAPI profile3_GetExpectedPacketCount(IWMProfile3 *iface, QWORD duration, QWORD *packets) -{ - WMReader *This = impl_from_IWMProfile3(iface); - FIXME("%p, %s, %p\n", This, wine_dbgstr_longlong(duration), packets); - return E_NOTIMPL; -} - -static const IWMProfile3Vtbl WMProfile3Vtbl = -{ - profile3_QueryInterface, - profile3_AddRef, - profile3_Release, - profile3_GetVersion, - profile3_GetName, - profile3_SetName, - profile3_GetDescription, - profile3_SetDescription, - profile3_GetStreamCount, - profile3_GetStream, - profile3_GetStreamByNumber, - profile3_RemoveStream, - profile3_RemoveStreamByNumber, - profile3_AddStream, - profile3_ReconfigStream, - profile3_CreateNewStream, - profile3_GetMutualExclusionCount, - profile3_GetMutualExclusion, - profile3_RemoveMutualExclusion, - profile3_AddMutualExclusion, - profile3_CreateNewMutualExclusion, - profile3_GetProfileID, - profile3_GetStorageFormat, - profile3_SetStorageFormat, - profile3_GetBandwidthSharingCount, - profile3_GetBandwidthSharing, - profile3_RemoveBandwidthSharing, - profile3_AddBandwidthSharing, - profile3_CreateNewBandwidthSharing, - profile3_GetStreamPrioritization, - profile3_SetStreamPrioritization, - profile3_RemoveStreamPrioritization, - profile3_CreateNewStreamPrioritization, - profile3_GetExpectedPacketCount -}; - -static inline WMReader *impl_from_IWMPacketSize2(IWMPacketSize2 *iface) +HRESULT WINAPI WMCheckURLExtension(const WCHAR *url) { - return CONTAINING_RECORD(iface, WMReader, IWMPacketSize2_iface); -} + FIXME("(%s): stub\n", wine_dbgstr_w(url)); -static HRESULT WINAPI packetsize_QueryInterface(IWMPacketSize2 *iface, REFIID riid, void **ppv) -{ - WMReader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); -} + if (!url) + return E_INVALIDARG; -static ULONG WINAPI packetsize_AddRef(IWMPacketSize2 *iface) -{ - WMReader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_AddRef(&This->IWMReader_iface); + return NS_E_INVALID_NAME; } -static ULONG WINAPI packetsize_Release(IWMPacketSize2 *iface) +HRESULT WINAPI WMCheckURLScheme(const WCHAR *scheme) { - WMReader *This = impl_from_IWMPacketSize2(iface); - return IWMReader_Release(&This->IWMReader_iface); -} + FIXME("(%s): stub\n", wine_dbgstr_w(scheme)); -static HRESULT WINAPI packetsize_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) -{ - WMReader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %p\n", This, size); - return E_NOTIMPL; + return NS_E_INVALID_NAME; } -static HRESULT WINAPI packetsize_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) +HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) { - WMReader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %d\n", This, size); - return E_NOTIMPL; -} + FIXME("(%p): stub\n", editor); -static HRESULT WINAPI packetsize_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) -{ - WMReader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %p\n", This, size); - return E_NOTIMPL; -} + *editor = NULL; -static HRESULT WINAPI packetsize_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) -{ - WMReader *This = impl_from_IWMPacketSize2(iface); - FIXME("%p, %d\n", This, size); return E_NOTIMPL; } -static const IWMPacketSize2Vtbl WMPacketSize2Vtbl = -{ - packetsize_QueryInterface, - packetsize_AddRef, - packetsize_Release, - packetsize_GetMaxPacketSize, - packetsize_SetMaxPacketSize, - packetsize_GetMinPacketSize, - packetsize_SetMinPacketSize -}; - -HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) -{ - WMReader *reader; - - TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader); - - reader = heap_alloc(sizeof(*reader)); - if(!reader) - return E_OUTOFMEMORY; - - reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; - reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; - reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; - reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; - reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; - reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; - reader->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; - reader->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl; - reader->IWMHeaderInfo3_iface.lpVtbl = &WMHeaderInfo3Vtbl; - reader->IWMLanguageList_iface.lpVtbl = &WMLanguageListVtbl; - reader->IReferenceClock_iface.lpVtbl = &ReferenceClockVtbl; - reader->IWMProfile3_iface.lpVtbl = &WMProfile3Vtbl; - reader->IWMPacketSize2_iface.lpVtbl = &WMPacketSize2Vtbl; - reader->ref = 1; - - *ret_reader = &reader->IWMReader_iface; - return S_OK; -} - -HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader) +HRESULT WINAPI WMCreateBackupRestorer(IUnknown *callback, IWMLicenseBackup **licBackup) { - return WMCreateReader(NULL, 0, ret_reader); -} + FIXME("(%p %p): stub\n", callback, licBackup); -HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) -{ - FIXME("(%p, %x, %p): stub\n", pcert, rights, syncreader); + if (!callback) + return E_INVALIDARG; - *syncreader = NULL; + *licBackup = NULL; return E_NOTIMPL; } typedef struct { - IWMProfileManager IWMProfileManager_iface; + IWMProfileManager2 IWMProfileManager2_iface; LONG ref; } WMProfileManager; -static inline WMProfileManager *impl_from_IWMProfileManager(IWMProfileManager *iface) +static inline WMProfileManager *impl_from_IWMProfileManager2(IWMProfileManager2 *iface) { - return CONTAINING_RECORD(iface, WMProfileManager, IWMProfileManager_iface); + return CONTAINING_RECORD(iface, WMProfileManager, IWMProfileManager2_iface); } -static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager2 *iface, REFIID riid, void **ppv) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IWMProfileManager_iface; + *ppv = &This->IWMProfileManager2_iface; }else if(IsEqualGUID(&IID_IWMProfileManager, riid)) { TRACE("(%p)->(IID_IWMProfileManager %p)\n", This, ppv); - *ppv = &This->IWMProfileManager_iface; + *ppv = &This->IWMProfileManager2_iface; + }else if(IsEqualGUID(&IID_IWMProfileManager2, riid)) { + TRACE("(%p)->(IID_IWMProfileManager2 %p)\n", This, ppv); + *ppv = &This->IWMProfileManager2_iface; }else { FIXME("Unsupported iface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -2142,9 +119,9 @@ static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, return S_OK; } -static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) +static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager2 *iface) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -2152,9 +129,9 @@ static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) return ref; } -static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) +static ULONG WINAPI WMProfileManager_Release(IWMProfileManager2 *iface) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -2165,49 +142,63 @@ static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) return ref; } -static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager *iface, WMT_VERSION version, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager2 *iface, WMT_VERSION version, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%x %p)\n", This, version, ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager *iface, REFGUID guid, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager2 *iface, REFGUID guid, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_guid(guid), ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager *iface, const WCHAR *profile, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager2 *iface, const WCHAR *profile, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_w(profile), ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) +static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager2 *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%p %p %p)\n", This, profile, profile_str, len); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager *iface, DWORD *ret) +static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager2 *iface, DWORD *ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%p)\n", This, ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager *iface, DWORD index, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager2 *iface, DWORD index, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%d %p)\n", This, index, ret); return E_NOTIMPL; } -static const IWMProfileManagerVtbl WMProfileManagerVtbl = { +static HRESULT WINAPI WMProfileManager2_GetSystemProfileVersion(IWMProfileManager2 *iface, WMT_VERSION *version) +{ + WMProfileManager *This = impl_from_IWMProfileManager2(iface); + FIXME("(%p)->(%p)\n", This, version); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager2_SetSystemProfileVersion(IWMProfileManager2 *iface, WMT_VERSION version) +{ + WMProfileManager *This = impl_from_IWMProfileManager2(iface); + FIXME("(%p)->(%x)\n", This, version); + return E_NOTIMPL; +} + +static const IWMProfileManager2Vtbl WMProfileManager2Vtbl = { WMProfileManager_QueryInterface, WMProfileManager_AddRef, WMProfileManager_Release, @@ -2216,7 +207,9 @@ static const IWMProfileManagerVtbl WMProfileManagerVtbl = { WMProfileManager_LoadProfileByData, WMProfileManager_SaveProfile, WMProfileManager_GetSystemProfileCount, - WMProfileManager_LoadSystemProfile + WMProfileManager_LoadSystemProfile, + WMProfileManager2_GetSystemProfileVersion, + WMProfileManager2_SetSystemProfileVersion }; HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) @@ -2229,9 +222,9 @@ HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) if(!profile_mgr) return E_OUTOFMEMORY; - profile_mgr->IWMProfileManager_iface.lpVtbl = &WMProfileManagerVtbl; + profile_mgr->IWMProfileManager2_iface.lpVtbl = &WMProfileManager2Vtbl; profile_mgr->ref = 1; - *ret = &profile_mgr->IWMProfileManager_iface; + *ret = (IWMProfileManager *)&profile_mgr->IWMProfileManager2_iface; return S_OK; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index dbbad6d8d40..457cc108b44 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -211,7 +211,7 @@ dll/win32/wintrust # Synced to WineStaging-4.18 dll/win32/wldap32 # Synced to WineStaging-4.18 dll/win32/wmi # Synced to WineStaging-2.9 dll/win32/wmiutils # Synced to WineStaging-4.18 -dll/win32/wmvcore # Synced to WineStaging-3.9 +dll/win32/wmvcore # Synced to WineStaging-4.18 dll/win32/wshom.ocx # Synced to WineStaging-3.3 dll/win32/wtsapi32 # Synced to WineStaging-3.9 dll/win32/wuapi # Synced to WineStaging-3.3

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs