Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHLWAPI] Highlight a difference and mark the module as synced with Wine Staging 2.16. CORE-13762
by Amine Khaldi 08 Oct '17

08 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d346cbc7305d1b4a81ea… commit 7d346cbc7305d1b4a81eafaeb3b289e0cfc6730e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 8 09:38:10 2017 +0100 [SHLWAPI] Highlight a difference and mark the module as synced with Wine Staging 2.16. CORE-13762 --- dll/win32/shlwapi/ordinal.c | 4 ++++ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index a6c67a9e72..4e331f4800 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -3501,7 +3501,11 @@ HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST cmIci.cbSize = sizeof(cmIci); cmIci.fMask = CMIC_MASK_ASYNCOK; cmIci.hwnd = hWnd; +#ifdef __REACTOS__ /* r75561 */ cmIci.lpVerb = MAKEINTRESOURCEA(dwCommandId - 1); +#else + cmIci.lpVerb = MAKEINTRESOURCEA(dwCommandId); +#endif cmIci.nShow = SW_SHOWNORMAL; hRet = IContextMenu_InvokeCommand(iContext, &cmIci); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 1eca9ef9cc..1a7c651da6 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -174,7 +174,7 @@ reactos/dll/win32/shdoclc # Synced to WineStaging-2.9 reactos/dll/win32/shdocvw # Synced to WineStaging-2.9 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-2.9 -reactos/dll/win32/shlwapi # Synced to WineStaging-2.9 +reactos/dll/win32/shlwapi # Synced to WineStaging-2.16 reactos/dll/win32/slbcsp # Synced to WineStaging-2.9 reactos/dll/win32/snmpapi # Synced to WineStaging-2.9 reactos/dll/win32/softpub # Synced to WineStaging-2.9

1 0

[reactos] 01/01: [MSIEXEC] Sync with Wine Staging 2.16. CORE-13762
by Amine Khaldi 08 Oct '17

08 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c6498fa67f32d83ccf55… commit 0c6498fa67f32d83ccf5505f2dc9ac6e5c1c2541 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 8 09:33:23 2017 +0100 [MSIEXEC] Sync with Wine Staging 2.16. CORE-13762 d73c38f msiexec: Fix parsing of command lines where quoted strings and properties are not separated by whitespace. --- base/system/msiexec/msiexec.c | 169 ++++++++++++++++++++++-------------------- media/doc/README.WINE | 2 +- 2 files changed, 88 insertions(+), 83 deletions(-) diff --git a/base/system/msiexec/msiexec.c b/base/system/msiexec/msiexec.c index 44f1f28862..f2155622de 100644 --- a/base/system/msiexec/msiexec.c +++ b/base/system/msiexec/msiexec.c @@ -212,14 +212,6 @@ static DWORD msi_atou(LPCWSTR str) return ret; } -static LPWSTR msi_strdup(LPCWSTR str) -{ - DWORD len = lstrlenW(str)+1; - LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); - lstrcpyW(ret, str); - return ret; -} - /* str1 is the same as str2, ignoring case */ static BOOL msi_strequal(LPCWSTR str1, LPCSTR str2) { @@ -409,90 +401,103 @@ static INT DoEmbedding( LPWSTR key ) enum chomp_state { - cs_whitespace, - cs_token, - cs_quote + CS_WHITESPACE, + CS_TOKEN, + CS_QUOTE }; -static int chomp( WCHAR *str ) +static int chomp( const WCHAR *in, WCHAR *out ) { - enum chomp_state state = cs_token; - WCHAR *p, *out; - int count = 1; - BOOL ignore; - - for( p = str, out = str; *p; p++ ) - { - ignore = TRUE; - switch( state ) - { - case cs_whitespace: - switch( *p ) - { - case ' ': - break; - case '"': - state = cs_quote; - count++; - break; - default: - count++; - ignore = FALSE; - state = cs_token; - } - break; - - case cs_token: - switch( *p ) - { - case '"': - state = cs_quote; - break; - case ' ': - state = cs_whitespace; - *out++ = 0; - break; - default: - ignore = FALSE; - } - break; - - case cs_quote: - switch( *p ) - { - case '"': - state = cs_token; - break; - default: - ignore = FALSE; - } - break; - } - if( !ignore ) - *out++ = *p; - } - - *out = 0; + enum chomp_state state = CS_TOKEN; + const WCHAR *p; + int count = 1; + BOOL ignore; - return count; + for (p = in; *p; p++) + { + ignore = TRUE; + switch (state) + { + case CS_WHITESPACE: + switch (*p) + { + case ' ': + break; + case '"': + state = CS_QUOTE; + count++; + break; + default: + count++; + ignore = FALSE; + state = CS_TOKEN; + } + break; + + case CS_TOKEN: + switch (*p) + { + case '"': + state = CS_QUOTE; + break; + case ' ': + state = CS_WHITESPACE; + if (out) *out++ = 0; + break; + default: + if (p > in && p[-1] == '"') + { + if (out) *out++ = 0; + count++; + } + ignore = FALSE; + } + break; + + case CS_QUOTE: + switch (*p) + { + case '"': + state = CS_TOKEN; + break; + default: + ignore = FALSE; + } + break; + } + if (!ignore && out) *out++ = *p; + } + if (out) *out = 0; + return count; } static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) { - WCHAR **argv, *p = msi_strdup(cmdline); - int i, n; + WCHAR **argv, *p; + int i, count; - n = chomp( p ); - argv = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1)); - for( i=0; i<n; i++ ) - { - argv[i] = p; - p += lstrlenW(p) + 1; - } - argv[i] = NULL; + *pargc = 0; + *pargv = NULL; + + count = chomp( cmdline, NULL ); + if (!(p = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(cmdline) + count + 1) * sizeof(WCHAR) ))) + return; + + count = chomp( cmdline, p ); + if (!(argv = HeapAlloc( GetProcessHeap(), 0, (count + 1) * sizeof(WCHAR *) ))) + { + HeapFree( GetProcessHeap(), 0, p ); + return; + } + for (i = 0; i < count; i++) + { + argv[i] = p; + p += lstrlenW( p ) + 1; + } + argv[i] = NULL; - *pargc = n; - *pargv = argv; + *pargc = count; + *pargv = argv; } static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***pargv ) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 778f42f7b4..1eca9ef9cc 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -243,7 +243,7 @@ reactos/base/applications/wordpad # Synced to WineStaging-1.9.16 reactos/base/applications/write # Synced to WineStaging-2.9 reactos/base/services/rpcss # Synced to WineStaging-1.9.16 reactos/base/system/expand # Synced to WineStaging-2.9 -reactos/base/system/msiexec # Synced to WineStaging-2.9 +reactos/base/system/msiexec # Synced to WineStaging-2.16 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported

1 0

[reactos] 04/04: [WMVCORE_WINETEST] Import from Wine Staging 2.16. CORE-13762
by Amine Khaldi 08 Oct '17

08 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84ccccabe02620185e577… commit 84ccccabe02620185e5773583543aa29344f100a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 8 10:31:10 2017 +0100 [WMVCORE_WINETEST] Import from Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/CMakeLists.txt | 1 + modules/rostests/winetests/wmvcore/CMakeLists.txt | 9 + modules/rostests/winetests/wmvcore/testlist.c | 10 + modules/rostests/winetests/wmvcore/wmvcore.c | 250 ++++++++++++++++++++++ 4 files changed, 270 insertions(+) diff --git a/modules/rostests/winetests/CMakeLists.txt b/modules/rostests/winetests/CMakeLists.txt index 8ddf420882..52d1114c73 100644 --- a/modules/rostests/winetests/CMakeLists.txt +++ b/modules/rostests/winetests/CMakeLists.txt @@ -116,6 +116,7 @@ add_subdirectory(winmm) add_subdirectory(wintrust) add_subdirectory(wldap32) add_subdirectory(wmiutils) +add_subdirectory(wmvcore) add_subdirectory(ws2_32) add_subdirectory(wscript) add_subdirectory(wshom) diff --git a/modules/rostests/winetests/wmvcore/CMakeLists.txt b/modules/rostests/winetests/wmvcore/CMakeLists.txt new file mode 100644 index 0000000000..d7cf021827 --- /dev/null +++ b/modules/rostests/winetests/wmvcore/CMakeLists.txt @@ -0,0 +1,9 @@ + +add_definitions( + -DUSE_WINE_TODOS + -D__WINESRC__) + +add_executable(wmvcore_winetest wmvcore.c testlist.c) +set_module_type(wmvcore_winetest win32cui) +add_importlibs(wmvcore_winetest ole32 wmvcore msvcrt kernel32) +add_rostests_file(TARGET wmvcore_winetest) diff --git a/modules/rostests/winetests/wmvcore/testlist.c b/modules/rostests/winetests/wmvcore/testlist.c new file mode 100644 index 0000000000..532810f645 --- /dev/null +++ b/modules/rostests/winetests/wmvcore/testlist.c @@ -0,0 +1,10 @@ +#define STANDALONE +#include <wine/test.h> + +extern void func_wmvcore(void); + +const struct test winetest_testlist[] = +{ + { "wmvcore", func_wmvcore }, + { 0, 0 } +}; diff --git a/modules/rostests/winetests/wmvcore/wmvcore.c b/modules/rostests/winetests/wmvcore/wmvcore.c new file mode 100644 index 0000000000..b11a5bf7de --- /dev/null +++ b/modules/rostests/winetests/wmvcore/wmvcore.c @@ -0,0 +1,250 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#define WIN32_LEAN_AND_MEAN +#include "initguid.h" +#include "wmsdkidl.h" + +#include "wine/test.h" + +HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer); + +static void test_wmwriter_interfaces(void) +{ + HRESULT hr; + IWMWriter *writer; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + + hr = WMCreateWriter( NULL, &writer ); + ok(hr == S_OK, "WMCreateWriter failed 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("Failed to create IWMWriter\n"); + return; + } + + hr = IWMWriter_QueryInterface(writer, &IID_IWMHeaderInfo, (void **)&header); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMWriter_QueryInterface(writer, &IID_IWMHeaderInfo2, (void **)&header2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMWriter_QueryInterface(writer, &IID_IWMHeaderInfo3, (void **)&header3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(header) + IWMHeaderInfo_Release(header); + if(header2) + IWMHeaderInfo2_Release(header2); + if(header3) + IWMHeaderInfo3_Release(header3); + IWMWriter_Release(writer); +} + +static void test_wmreader_interfaces(void) +{ + HRESULT hr; + IWMReader *reader; + IWMReaderAdvanced *advanced; + IWMReaderAdvanced2 *advanced2; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + IWMProfile *profile; + IWMProfile2 *profile2; + IWMProfile3 *profile3; + IWMPacketSize *packet; + IWMPacketSize2 *packet2; + IWMReaderAccelerator *accel; + IWMReaderTimecode *timecode; + IWMReaderNetworkConfig *netconfig; + IWMReaderNetworkConfig2 *netconfig2; + IWMReaderStreamClock *clock; + IWMReaderTypeNegotiation *negotiation; + IWMDRMReader *drmreader; + IWMDRMReader2 *drmreader2; + IWMDRMReader3 *drmreader3; + IWMReaderPlaylistBurn *playlist; + IWMLanguageList *langlist; + IReferenceClock *refclock; + + hr = WMCreateReader( NULL, 0, &reader ); + ok(hr == S_OK, "WMCreateReader failed 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("Failed to create IWMReader\n"); + return; + } + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced, (void **)&advanced); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced2); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMHeaderInfo, (void **)&header); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMHeaderInfo2, (void **)&header2); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMHeaderInfo3, (void **)&header3); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMProfile2, (void **)&profile2); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMProfile3, (void **)&profile3); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAccelerator, (void **)&accel); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderNetworkConfig, (void **)&netconfig); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderNetworkConfig2, (void **)&netconfig2); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderStreamClock, (void **)&clock); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTypeNegotiation, (void **)&negotiation); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader, (void **)&drmreader); + ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader2, (void **)&drmreader2); + ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader3, (void **)&drmreader3); + ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMLanguageList, (void **)&langlist); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IReferenceClock, (void **)&refclock); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(packet) + IWMPacketSize_Release(packet); + if(packet2) + IWMPacketSize2_Release(packet2); + if(advanced) + IWMReaderAdvanced_Release(advanced); + if(advanced2) + IWMReaderAdvanced2_Release(advanced2); + 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(accel) + IWMReaderAccelerator_Release(accel); + if(timecode) + IWMReaderTimecode_Release(timecode); + if(netconfig) + IWMReaderNetworkConfig_Release(netconfig); + if(netconfig2) + IWMReaderNetworkConfig2_Release(netconfig2); + if(clock) + IWMReaderStreamClock_Release(clock); + if(negotiation) + IWMReaderTypeNegotiation_Release(negotiation); + if(playlist) + IWMReaderPlaylistBurn_Release(playlist); + if(langlist) + IWMLanguageList_Release(langlist); + if(refclock) + IReferenceClock_Release(refclock); + + IWMReader_Release(reader); +} + +static void test_profile_manager_interfaces(void) +{ + HRESULT hr; + IWMProfileManager *profile; + + hr = WMCreateProfileManager(&profile); + ok(hr == S_OK, "WMCreateProfileManager failed 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("Failed to create IWMProfileManager\n"); + return; + } + + IWMProfileManager_Release(profile); +} + +static void test_WMCreateWriterPriv(void) +{ + IWMWriter *writer, *writer2; + HRESULT hr; + + hr = WMCreateWriterPriv(&writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IWMWriter_QueryInterface(writer, &IID_IWMWriter, (void**)&writer2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IWMWriter_Release(writer); + IWMWriter_Release(writer2); +} + +START_TEST(wmvcore) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok(hr == S_OK, "failed to init com\n"); + if(hr != S_OK) + return; + + test_wmreader_interfaces(); + test_wmwriter_interfaces(); + test_profile_manager_interfaces(); + test_WMCreateWriterPriv(); + + CoUninitialize(); +}

1 0

[reactos] 03/04: [WMVCORE] Sync with Wine Staging 2.16. CORE-13762
by Amine Khaldi 08 Oct '17

08 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea59f30f8694a2a4cfb3d… commit ea59f30f8694a2a4cfb3d7d8a52d3aa0240cbf1f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 8 10:30:08 2017 +0100 [WMVCORE] Sync with Wine Staging 2.16. CORE-13762 998fe04 wmvcore: Support IWMPacketSize2 interfaces in IWMReader. 0570cf9 wmvcore: Support IWMProfile3 interfaces in IWMReader. 98e94b2 wmvcore: Support IReferenceClock interfaces in IWMReader. 163aac1 wmvcore: Support IWMLanguageList interfaces in IWMReader. b1702c4 wmvcore: Support IWMHeaderInfo/2/3 interfaces in IWMReader. 73f8066 wmvcore: Support IWMReaderPlaylistBurn interface in IWMReader. b15c398 wmvcore: Support IWMReaderTimecode interface in IWMReader. 465feb7 wmvcore: Support IWMReaderTypeNegotiation interface in IWMReader. 437c667 wmvcore: Support IWMReaderStreamClock interface in IWMReader. 34b9b10 wmvcore: Support IWMReaderNetworkConfig1/2 interfaces in IWMReader. 94af027 wmvcore: Support IWMReaderAccelerator in IWMReader. 3f6b7c3 wmvcore: Add WMCheckURLScheme stub. 7381cec wmvcore: Implement WMCreateWriterPriv. --- dll/win32/wmvcore/CMakeLists.txt | 2 +- dll/win32/wmvcore/wmvcore.spec | 4 +- dll/win32/wmvcore/wmvcore_main.c | 1432 +++++++++++++++++++++++++++++++++++++- dll/win32/wmvcore/writer.c | 5 + media/doc/README.WINE | 2 +- 5 files changed, 1440 insertions(+), 5 deletions(-) diff --git a/dll/win32/wmvcore/CMakeLists.txt b/dll/win32/wmvcore/CMakeLists.txt index d67e20dfc7..094ded5ecb 100644 --- a/dll/win32/wmvcore/CMakeLists.txt +++ b/dll/win32/wmvcore/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -spec2def(wmvcore.dll wmvcore.spec) +spec2def(wmvcore.dll wmvcore.spec ADD_IMPORTLIB) list(APPEND SOURCE wmvcore_main.c diff --git a/dll/win32/wmvcore/wmvcore.spec b/dll/win32/wmvcore/wmvcore.spec index bb17683b55..f3e3b64122 100644 --- a/dll/win32/wmvcore/wmvcore.spec +++ b/dll/win32/wmvcore/wmvcore.spec @@ -1,5 +1,5 @@ @ stub WMCheckURLExtension -@ stub WMCheckURLScheme +@ stdcall WMCheckURLScheme(wstr) @ stub WMCreateBackupRestorerPrivate @ stub WMCreateSyncReaderPriv @ stub WMIsAvailableOffline @@ -15,6 +15,6 @@ @ stdcall WMCreateWriter(ptr ptr) @ stub WMCreateWriterFileSink @ stub WMCreateWriterNetworkSink -@ stub WMCreateWriterPriv +@ stdcall WMCreateWriterPriv(ptr) @ stub WMCreateWriterPushSink @ stub WMIsContentProtected diff --git a/dll/win32/wmvcore/wmvcore_main.c b/dll/win32/wmvcore/wmvcore_main.c index d196079698..be07909730 100644 --- a/dll/win32/wmvcore/wmvcore_main.c +++ b/dll/win32/wmvcore/wmvcore_main.c @@ -19,7 +19,7 @@ #include "wmvcore.h" #include "initguid.h" -#include "wmsdkidl.h" +#include "wmsdk.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); @@ -47,6 +47,13 @@ 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); @@ -59,6 +66,17 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) 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; @@ -95,6 +113,57 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi }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); @@ -649,6 +718,1356 @@ static const IWMReaderAdvanced6Vtbl WMReaderAdvanced6Vtbl = { 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, %p, %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) +{ + return CONTAINING_RECORD(iface, WMReader, IWMPacketSize2_iface); +} + +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); +} + +static ULONG WINAPI packetsize_AddRef(IWMPacketSize2 *iface) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI packetsize_Release(IWMPacketSize2 *iface) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI packetsize_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + FIXME("%p, %p\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packetsize_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + FIXME("%p, %d\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI packetsize_GetMinPacketSize(IWMPacketSize2 *iface, DWORD *size) +{ + WMReader *This = impl_from_IWMPacketSize2(iface); + FIXME("%p, %p\n", This, size); + return E_NOTIMPL; +} + +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; @@ -661,6 +2080,17 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ 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; diff --git a/dll/win32/wmvcore/writer.c b/dll/win32/wmvcore/writer.c index f5701482f9..c1c30be895 100644 --- a/dll/win32/wmvcore/writer.c +++ b/dll/win32/wmvcore/writer.c @@ -369,3 +369,8 @@ HRESULT WINAPI WMCreateWriter(IUnknown *reserved, IWMWriter **writer) *writer = &ret->IWMWriter_iface; return S_OK; } + +HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer) +{ + return WMCreateWriter(NULL, writer); +} diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d295d47a66..778f42f7b4 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -210,7 +210,7 @@ reactos/dll/win32/wintrust # Synced to WineStaging-2.16 reactos/dll/win32/wldap32 # Synced to WineStaging-2.9 reactos/dll/win32/wmi # Synced to WineStaging-2.9 reactos/dll/win32/wmiutils # Synced to WineStaging-2.9 -reactos/dll/win32/wmvcore # Synced to WineStaging-2.9 +reactos/dll/win32/wmvcore # Synced to WineStaging-2.16 reactos/dll/win32/wshom.ocx # Synced to WineStaging-2.9 reactos/dll/win32/wtsapi32 # Synced to WineStaging-2.9 reactos/dll/win32/wuapi # Synced to WineStaging-2.9

1 0

[reactos] 02/04: [PSDK] Update wmsdkidl.idl and import some of its related idl files from Wine Staging 2.16. CORE-13762
by Amine Khaldi 08 Oct '17

08 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c95f8e51d3541984953c0… commit c95f8e51d3541984953c021d3a67d586eba9f94d Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 8 10:27:23 2017 +0100 [PSDK] Update wmsdkidl.idl and import some of its related idl files from Wine Staging 2.16. CORE-13762 --- sdk/include/psdk/CMakeLists.txt | 6 + sdk/include/psdk/drmexternals.idl | 19 + sdk/include/psdk/mediaobj.idl | 242 +++++++ sdk/include/psdk/mfidl.idl | 169 +++++ sdk/include/psdk/mfobjects.idl | 585 +++++++++++++++++ sdk/include/psdk/mftransform.idl | 113 ++++ sdk/include/psdk/nserror.h | 1266 +++++++++++++++++++++++++++++++++++++ sdk/include/psdk/wmdrmsdk.idl | 81 +++ sdk/include/psdk/wmsdk.h | 26 + sdk/include/psdk/wmsdkidl.idl | 606 +++++++++++++++++- 10 files changed, 3111 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/CMakeLists.txt b/sdk/include/psdk/CMakeLists.txt index 1b33c14a66..2f63a08e30 100644 --- a/sdk/include/psdk/CMakeLists.txt +++ b/sdk/include/psdk/CMakeLists.txt @@ -43,6 +43,7 @@ list(APPEND SOURCE docobj.idl docobjectservice.idl downloadmgr.idl + drmexternals.idl # dyngraph.idl endpointvolume.idl exdisp.idl @@ -58,7 +59,11 @@ list(APPEND SOURCE indexsrv.idl inputscope.idl inseng.idl + mediaobj.idl metahost.idl + mfidl.idl + mfobjects.idl + mftransform.idl mimeinfo.idl mimeole.idl mlang.idl @@ -124,6 +129,7 @@ list(APPEND SOURCE wincodec.idl wincodecsdk.idl winsxs.idl + wmdrmsdk.idl wmiutils.idl wmsbuffer.idl wmsdkidl.idl diff --git a/sdk/include/psdk/drmexternals.idl b/sdk/include/psdk/drmexternals.idl new file mode 100644 index 0000000000..88826ad561 --- /dev/null +++ b/sdk/include/psdk/drmexternals.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "wmdrmsdk.idl"; diff --git a/sdk/include/psdk/mediaobj.idl b/sdk/include/psdk/mediaobj.idl new file mode 100644 index 0000000000..04c82e890a --- /dev/null +++ b/sdk/include/psdk/mediaobj.idl @@ -0,0 +1,242 @@ +/* + * Copyright (C) 2002 Alexandre Julliard + * Copyright (C) 2004 Vincent Béron + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "strmif.idl"; + +interface IDMOQualityControl; +interface IDMOVideoOutputOptimizations; + +typedef struct _DMOMediaType +{ + GUID majortype; + GUID subtype; + BOOL bFixedSizeSamples; + BOOL bTemporalCompression; + ULONG lSampleSize; + GUID formattype; + IUnknown *pUnk; + ULONG cbFormat; + BYTE *pbFormat; +} DMO_MEDIA_TYPE; + +/***************************************************************************** + * IEnumDMO interface + */ +[ + object, + uuid(2C3CD98A-2BFA-4A53-9C27-5249BA64BA0F), + pointer_default(unique) +] +interface IEnumDMO : IUnknown +{ + [local] + HRESULT Next( + [in] DWORD cItemsToFetch, + [out] CLSID *pCLSID, + [out] WCHAR **Names, + [out] DWORD *pcItemsFetched + ); + + HRESULT Skip( + [in] DWORD cItemsToSkip + ); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumDMO **ppEnum + ); +} + +/***************************************************************************** + * IMediaBuffer interface + */ +[ + object, + uuid(59eff8b9-938c-4a26-82f2-95cb84cdc837), + local +] +interface IMediaBuffer : IUnknown +{ + HRESULT SetLength( + DWORD cbLength + ); + + HRESULT GetMaxLength( + [out] DWORD *pcbMaxLength + ); + + HRESULT GetBufferAndLength( + [out] BYTE **ppBuffer, + [out] DWORD *pcbLength + ); +} + +typedef struct _DMO_OUTPUT_DATA_BUFFER { + IMediaBuffer *pBuffer; + DWORD dwStatus; + REFERENCE_TIME rtTimestamp; + REFERENCE_TIME rtTimelength; +} DMO_OUTPUT_DATA_BUFFER, *PDMO_OUTPUT_DATA_BUFFER; + +enum _DMO_INPLACE_PROCESS_FLAGS { + DMO_INPLACE_NORMAL = 0x00000000, + DMO_INPLACE_ZERO = 0x00000001 +}; + +/***************************************************************************** + * IMediaObject interface + */ +[ + object, + uuid(d8ad0f58-5494-4102-97c5-ec798e59bcf4), + local +] +interface IMediaObject : IUnknown +{ + HRESULT GetStreamCount( + [out] DWORD *pcInputStreams, + [out] DWORD *pcOutputStreams + ); + + HRESULT GetInputStreamInfo( + DWORD dwInputStreamIndex, + [out] DWORD *pdwFlags + ); + + HRESULT GetOutputStreamInfo( + DWORD dwOutputStreamIndex, + [out] DWORD *pdwFlags + ); + + HRESULT GetInputType( + DWORD dwInputStreamIndex, + DWORD dwTypeIndex, + [out] DMO_MEDIA_TYPE *pmt + ); + + HRESULT GetOutputType( + DWORD dwOutputStreamIndex, + DWORD dwTypeIndex, + [out] DMO_MEDIA_TYPE *pmt + ); + + HRESULT SetInputType( + DWORD dwInputStreamIndex, + [in] const DMO_MEDIA_TYPE *pmt, + DWORD dwFlags + ); + + HRESULT SetOutputType( + DWORD dwOutputStreamIndex, + [in] const DMO_MEDIA_TYPE *pmt, + DWORD dwFlags + ); + + HRESULT GetInputCurrentType( + DWORD dwInputStreamIndex, + [out] DMO_MEDIA_TYPE *pmt + ); + + HRESULT GetOutputCurrentType( + DWORD dwOutputStreamIndex, + [out] DMO_MEDIA_TYPE *pmt + ); + + HRESULT GetInputSizeInfo( + DWORD dwInputStreamIndex, + [out] DWORD *pcbSize, + [out] DWORD *pcbMaxLookahead, + [out] DWORD *pcbAlignment + ); + + HRESULT GetOutputSizeInfo( + DWORD dwOutputStreamIndex, + [out] DWORD *pcbSize, + [out] DWORD *pcbAlignment + ); + + HRESULT GetInputMaxLatency( + DWORD dwInputStreamIndex, + [out] REFERENCE_TIME *prtMaxLatency + ); + + HRESULT SetInputMaxLatency( + DWORD dwInputStreamIndex, + REFERENCE_TIME rtMaxLatency + ); + + HRESULT Flush(); + + HRESULT Discontinuity(DWORD dwInputStreamIndex); + + HRESULT AllocateStreamingResources(); + + HRESULT FreeStreamingResources(); + + HRESULT GetInputStatus( + DWORD dwInputStreamIndex, + [out] DWORD *dwFlags + ); + + HRESULT ProcessInput( + DWORD dwInputStreamIndex, + IMediaBuffer *pBuffer, + DWORD dwFlags, + REFERENCE_TIME rtTimestamp, + REFERENCE_TIME rtTimelength + ); + + HRESULT ProcessOutput( + DWORD dwFlags, + DWORD cOutputBufferCount, + [in,out] DMO_OUTPUT_DATA_BUFFER *pOutputBuffers, + [out] DWORD *pdwStatus + ); + + HRESULT Lock(LONG bLock); +}; + +/***************************************************************************** + * IMediaObjectInPlace interface + */ + +[ + object, + uuid(651b9ad0-0fc7-4aa9-9538-d89931010741), + local +] +interface IMediaObjectInPlace : IUnknown { + HRESULT Process( + [in] ULONG ulSize, + [in,out] BYTE* pData, + [in] REFERENCE_TIME refTimeStart, + [in] DWORD dwFlags + ); + + HRESULT Clone( + [out] IMediaObjectInPlace **ppMediaObject + ); + + HRESULT GetLatency( + [out] REFERENCE_TIME *pLatencyTime + ); +} diff --git a/sdk/include/psdk/mfidl.idl b/sdk/include/psdk/mfidl.idl new file mode 100644 index 0000000000..3c33806235 --- /dev/null +++ b/sdk/include/psdk/mfidl.idl @@ -0,0 +1,169 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "mfobjects.idl"; +import "mftransform.idl"; + +typedef unsigned __int64 TOPOID; +typedef LONGLONG MFTIME; + +typedef enum MF_TOPOLOGY_TYPE +{ + MF_TOPOLOGY_OUTPUT_NODE, + MF_TOPOLOGY_SOURCESTREAM_NODE, + MF_TOPOLOGY_TRANSFORM_NODE, + MF_TOPOLOGY_TEE_NODE, + MF_TOPOLOGY_MAX = 0xffffffff +} MF_TOPOLOGY_TYPE; + +typedef enum _MFCLOCK_STATE +{ + MFCLOCK_STATE_INVALID, + MFCLOCK_STATE_RUNNING, + MFCLOCK_STATE_STOPPED, + MFCLOCK_STATE_PAUSED +} MFCLOCK_STATE; + +typedef enum MF_OBJECT_TYPE +{ + MF_OBJECT_MEDIASOURCE, + MF_OBJECT_BYTESTREAM, + MF_OBJECT_INVALID +} MF_OBJECT_TYPE; + +typedef struct _MFCLOCK_PROPERTIES +{ + unsigned __int64 qwCorrelationRate; + GUID guidClockId; + DWORD dwClockFlags; + unsigned __int64 qwClockFrequency; + DWORD dwClockTolerance; + DWORD dwClockJitter; +} MFCLOCK_PROPERTIES; + +[ + object, + uuid(2eb1e945-18b8-4139-9b1a-d5d584818530), +] +interface IMFClock : IUnknown +{ + HRESULT GetClockCharacteristics([out] DWORD *characteristics); + HRESULT GetCorrelatedTime([in] DWORD reserved, [out] LONGLONG *clock_time, [out] MFTIME *system_time); + HRESULT GetContinuityKey([out] DWORD *key); + HRESULT GetState([in] DWORD reserved, [out] MFCLOCK_STATE *state); + HRESULT GetProperties([out] MFCLOCK_PROPERTIES *props); +} + +[ + object, + uuid(83cf873a-f6da-4bc8-823f-bacfd55dc430), +] +interface IMFTopologyNode : IMFAttributes +{ + HRESULT SetObject([in] IUnknown *object); + HRESULT GetObject([out] IUnknown **object); + HRESULT GetNodeType([out] MF_TOPOLOGY_TYPE *type); + HRESULT GetTopoNodeID([out] TOPOID *id); + HRESULT SetTopoNodeID([in] TOPOID id); + HRESULT GetInputCount([out] DWORD *count); + HRESULT GetOutputCount([out] DWORD *count); + [local] HRESULT ConnectOutput([in] DWORD output_index, [in] IMFTopologyNode *node, [in] DWORD input_index); + [local] HRESULT DisconnectOutput([in] DWORD index); + HRESULT GetInput([in] DWORD input_index, [out] IMFTopologyNode **node, [out] DWORD *output_index); + HRESULT GetOutput([in] DWORD output_index, [out] IMFTopologyNode **node, [out] DWORD *input_index); + [local] HRESULT SetOutputPrefType([in] DWORD index, [in] IMFMediaType *type); + [local] HRESULT GetOutputPrefType([in] DWORD output_index, [out] IMFMediaType **type); + [call_as(GetOutputPrefType)] HRESULT RemoteGetOutputPrefType([in] DWORD index, [out] DWORD *length, + [out, size_is(, *length)] BYTE **data); + [local] HRESULT SetInputPrefType([in] DWORD index, [in] IMFMediaType *type); + [local] HRESULT GetInputPrefType([in] DWORD index, [out] IMFMediaType **type); + [call_as(GetInputPrefType)] HRESULT RemoteGetInputPrefType([in] DWORD index, [out] DWORD *length, + [out, size_is(, *length)] BYTE **data); + HRESULT CloneFrom([in] IMFTopologyNode *node); +} + +[ + object, + uuid(83cf873a-f6da-4bc8-823f-bacfd55dc433), +] +interface IMFTopology : IMFAttributes +{ + HRESULT GetTopologyID([out] TOPOID *id); + [local] HRESULT AddNode([in] IMFTopologyNode *node); + [local] HRESULT RemoveNode([in] IMFTopologyNode *node); + HRESULT GetNodeCount([out] WORD *nodes); + HRESULT GetNode([in] WORD index, [out] IMFTopologyNode **node); + [local] HRESULT Clear(); + HRESULT CloneFrom([in] IMFTopology *topology); + HRESULT GetNodeByID([in] TOPOID id, [out] IMFTopologyNode **node); + HRESULT GetSourceNodeCollection([out] IMFCollection **collection); + HRESULT GetOutputNodeCollection([out] IMFCollection **collection); +} + +[ + object, + uuid(90377834-21d0-4dee-8214-ba2e3e6c1127), +] +interface IMFMediaSession : IMFMediaEventGenerator +{ + HRESULT SetTopology([in] DWORD flags, [in] IMFTopology *topology); + HRESULT ClearTopologies(); + HRESULT Start([in, unique] const GUID *format, [in, unique] const PROPVARIANT *start); + HRESULT Pause(); + HRESULT Stop(); + HRESULT Close(); + HRESULT Shutdown(); + HRESULT GetClock([out] IMFClock **clock); + HRESULT GetSessionCapabilities([out] DWORD *caps); + HRESULT GetFullTopology([in] DWORD flags, [in] TOPOID id, [out] IMFTopology **topology); +} + +[ + object, + uuid(fbe5a32d-a497-4b61-bb85-97b1a848a6e3) +] +interface IMFSourceResolver : IUnknown +{ + [local] HRESULT CreateObjectFromURL([in] const WCHAR *url, [in] DWORD flags, [in] IPropertyStore *props, + [out] MF_OBJECT_TYPE *obj_type, [out] IUnknown **object); + [local] HRESULT CreateObjectFromByteStream([in] IMFByteStream *stream, [in] const WCHAR *url, [in] DWORD flags, + [in] IPropertyStore *props, [out] MF_OBJECT_TYPE *obj_type, [out] IUnknown **object); + [local] HRESULT BeginCreateObjectFromURL([in] const WCHAR *url, [in] DWORD flags, [in] IPropertyStore *props, + [out] IUnknown **cancel_cookie, [in] IMFAsyncCallback *callback, [in] IUnknown *unk_state); + [call_as(BeginCreateObjectFromURL)] HRESULT RemoteBeginCreateObjectFromURL([in, string] const WCHAR *url, + [in] DWORD flags, [in] IPropertyStore *props, [in] IMFRemoteAsyncCallback *callback); + [local] HRESULT EndCreateObjectFromURL([in] IMFAsyncResult *result, [out] MF_OBJECT_TYPE *obj_type, + [out] IUnknown **object); + [call_as(EndCreateObjectFromURL)] HRESULT RemoteEndCreateObjectFromURL([in] IUnknown *result, + [out] MF_OBJECT_TYPE *obj_type, [out] IUnknown **object); + [local] HRESULT BeginCreateObjectFromByteStream([in] IMFByteStream *stream, [in] const WCHAR *url, + [in] DWORD flags, [in] IPropertyStore *props, [out] IUnknown **cancel_cookie, + [in] IMFAsyncCallback *callback, [in] IUnknown *unk_state); + [call_as(BeginCreateObjectFromByteStream)] HRESULT RemoteBeginCreateObjectFromByteStream([in] IMFByteStream *stream, + [in, unique] const WCHAR *url, [in] DWORD flags, [in, unique] IPropertyStore *props, + [in] IMFRemoteAsyncCallback *callback); + [local] HRESULT EndCreateObjectFromByteStream([in] IMFAsyncResult *result, [out] MF_OBJECT_TYPE *obj_type, + [out] IUnknown **object); + [call_as(EndCreateObjectFromByteStream)] HRESULT RemoteEndCreateObjectFromByteStream([in] IUnknown *result, + [out] MF_OBJECT_TYPE *obj_type, [out] IUnknown **object); + [local] HRESULT CanceObjectCreation([in] IUnknown *cancel_cookie); +} + +cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") +cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") +cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") diff --git a/sdk/include/psdk/mfobjects.idl b/sdk/include/psdk/mfobjects.idl new file mode 100644 index 0000000000..467535dbd8 --- /dev/null +++ b/sdk/include/psdk/mfobjects.idl @@ -0,0 +1,585 @@ +/* + * Copyright 2015 Jacek Caban 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 St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "propsys.idl"; +import "mediaobj.idl"; + +cpp_quote("#include <mmreg.h>") +#include <mmreg.h> + +typedef ULONGLONG QWORD; + +typedef enum _MF_ATTRIBUTE_TYPE { + MF_ATTRIBUTE_UINT32 = VT_UI4, + MF_ATTRIBUTE_UINT64 = VT_UI8, + MF_ATTRIBUTE_DOUBLE = VT_R8, + MF_ATTRIBUTE_GUID = VT_CLSID, + MF_ATTRIBUTE_STRING = VT_LPWSTR, + MF_ATTRIBUTE_BLOB = VT_VECTOR | VT_UI1, + MF_ATTRIBUTE_IUNKNOWN = VT_UNKNOWN +} MF_ATTRIBUTE_TYPE; + +typedef enum _MF_ATTRIBUTES_MATCH_TYPE { + MF_ATTRIBUTES_MATCH_OUR_ITEMS = 0, + MF_ATTRIBUTES_MATCH_THEIR_ITEMS = 1, + MF_ATTRIBUTES_MATCH_ALL_ITEMS = 2, + MF_ATTRIBUTES_MATCH_INTERSECTION = 3, + MF_ATTRIBUTES_MATCH_SMALLER = 4 +} MF_ATTRIBUTES_MATCH_TYPE; + +[ + object, + uuid(2cd2d921-c447-44a7-a13c-4adabfc247e3) +] +interface IMFAttributes : IUnknown +{ + HRESULT GetItem(REFGUID guidKey, [in, out, ptr] PROPVARIANT *pValue); + HRESULT GetItemType(REFGUID guidKey, [out] MF_ATTRIBUTE_TYPE *pType); + HRESULT CompareItem(REFGUID guidKey, REFPROPVARIANT Value, [out] BOOL *pbResult); + HRESULT Compare(IMFAttributes *pTheirs, MF_ATTRIBUTES_MATCH_TYPE MatchType, [out] BOOL *pbResult); + HRESULT GetUINT32(REFGUID guidKey, [out] UINT32 *punValue); + HRESULT GetUINT64(REFGUID guidKey, [out] UINT64 *punValue); + HRESULT GetDouble(REFGUID guidKey, [out] double *pfValue); + HRESULT GetGUID(REFGUID guidKey, [out] GUID *pguidValue); + HRESULT GetStringLength(REFGUID guidKey, [out] UINT32 *pcchLength); + HRESULT GetString(REFGUID guidKey, [out, size_is(cchBufSize)] LPWSTR pwszValue, UINT32 cchBufSize, + [in, out, ptr] UINT32 *pcchLength); + HRESULT GetAllocatedString(REFGUID guidKey, [out, size_is(,*pcchLength+1)] LPWSTR *ppwszValue, + [out] UINT32 *pcchLength); + HRESULT GetBlobSize(REFGUID guidKey, [out] UINT32 *pcbBlobSize); + HRESULT GetBlob(REFGUID guidKey, [out, size_is(cbBufSize)] UINT8 *pBuf, UINT32 cbBufSize, + [in, out, ptr] UINT32 *pcbBlobSize); + HRESULT GetAllocatedBlob(REFGUID guidKey, [out, size_is(,*pcbSize)] UINT8 **ppBuf, [out] UINT32 *pcbSize); + HRESULT GetUnknown(REFGUID guidKey, REFIID riid, [out, iid_is(riid)] LPVOID *ppv); + HRESULT SetItem(REFGUID guidKey, REFPROPVARIANT Value); + HRESULT DeleteItem(REFGUID guidKey); + HRESULT DeleteAllItems(); + HRESULT SetUINT32(REFGUID guidKey, UINT32 unValue); + HRESULT SetUINT64(REFGUID guidKey, UINT64 unValue); + HRESULT SetDouble(REFGUID guidKey, double fValue); + HRESULT SetGUID(REFGUID guidKey, REFGUID guidValue); + HRESULT SetString(REFGUID guidKey, [in, string] LPCWSTR wszValue); + HRESULT SetBlob(REFGUID guidKey, [in, size_is(cbBufSize)] const UINT8* pBuf, UINT32 cbBufSize); + HRESULT SetUnknown(REFGUID guidKey, [in] IUnknown *pUnknown); + HRESULT LockStore(); + HRESULT UnlockStore(); + HRESULT GetCount([out] UINT32 *pcItems); + HRESULT GetItemByIndex(UINT32 unIndex, [out] GUID *pguidKey, [in, out, ptr] PROPVARIANT *pValue); + HRESULT CopyAllItems([in] IMFAttributes *pDest); +} + +enum MF_ATTRIBUTE_SERIALIZE_OPTIONS { + MF_ATTRIBUTE_SERIALIZE_UNKNOWN_BYREF = 0x00000001 +}; + +[ + object, + uuid(045fa593-8799-42b8-bc8d-8968c6453507), + local +] +interface IMFMediaBuffer : IUnknown +{ + HRESULT Lock([out] BYTE **ppbBuffer, [out] DWORD *pcbMaxLength, [out] DWORD *pcbCurrentLength); + HRESULT Unlock(); + HRESULT GetCurrentLength([out] DWORD *pcbCurrentLength); + HRESULT SetCurrentLength([in] DWORD cbCurrentLength); + HRESULT GetMaxLength([out] DWORD *pcbMaxLength); +} + +[ + object, + uuid(c40a00f2-b93a-4d80-ae8c-5a1c634f58e4), + local +] +interface IMFSample : IMFAttributes +{ + HRESULT GetSampleFlags([out] DWORD *pdwSampleFlags); + HRESULT SetSampleFlags([in] DWORD dwSampleFlags); + HRESULT GetSampleTime([out] LONGLONG *phnsSampleTime); + HRESULT SetSampleTime([in] LONGLONG hnsSampleTime); + HRESULT GetSampleDuration([out] LONGLONG *phnsSampleDuration); + HRESULT SetSampleDuration([in] LONGLONG hnsSampleDuration); + HRESULT GetBufferCount([out] DWORD *pdwBufferCount); + HRESULT GetBufferByIndex([in] DWORD dwIndex, [out] IMFMediaBuffer **ppBuffer); + HRESULT ConvertToContiguousBuffer([out] IMFMediaBuffer **ppBuffer); + HRESULT AddBuffer([in] IMFMediaBuffer *pBuffer); + HRESULT RemoveBufferByIndex([in] DWORD dwIndex); + HRESULT RemoveAllBuffers(); + HRESULT GetTotalLength([out] DWORD *pcbTotalLength); + HRESULT CopyToBuffer([in] IMFMediaBuffer *pBuffer); +} + +[ + object, + uuid(7dc9d5f9-9ed9-44ec-9bbf-0600bb589fbb), + local +] +interface IMF2DBuffer : IUnknown +{ + HRESULT Lock2D([out] BYTE **pbScanline0, [out] LONG *plPitch); + HRESULT Unlock2D(); + HRESULT GetScanline0AndPitch([out] BYTE **pbScanline0, [out] LONG *plPitch); + HRESULT IsContiguousFormat([out] BOOL *pfIsContiguous); + HRESULT GetContiguousLength([out] DWORD *pcbLength); + HRESULT ContiguousCopyTo([out, size_is(cbDestBuffer)] BYTE *pbDestBuffer, [in] DWORD cbDestBuffer); + HRESULT ContiguousCopyFrom([in, size_is(cbSrcBuffer)] const BYTE *pbSrcBuffer, [in] DWORD cbSrcBuffer); +} + +[ + object, + uuid(44ae0fa8-ea31-4109-8d2e-4cae4997c555), + local +] +interface IMFMediaType : IMFAttributes +{ + HRESULT GetMajorType([out] GUID *pguidMajorType); + HRESULT IsCompressedFormat([out] BOOL *pfCompressed); + HRESULT IsEqual([in] IMFMediaType *pIMediaType, [out] DWORD *pdwFlags); + HRESULT GetRepresentation([in] GUID guidRepresentation, [out] LPVOID *ppvRepresentation); + HRESULT FreeRepresentation([in] GUID guidRepresentation, [in] LPVOID pvRepresentation); +} + +cpp_quote("#define MF_MEDIATYPE_EQUAL_MAJOR_TYPES 0x00000001") +cpp_quote("#define MF_MEDIATYPE_EQUAL_FORMAT_TYPES 0x00000002") +cpp_quote("#define MF_MEDIATYPE_EQUAL_FORMAT_DATA 0x00000004") +cpp_quote("#define MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA 0x00000008") + +[ + object, + uuid(26a0adc3-ce26-4672-9304-69552edd3faf), + local +] +interface IMFAudioMediaType : IMFMediaType +{ + const WAVEFORMATEX *GetAudioFormat(); +} + +typedef struct { + GUID guidMajorType; + GUID guidSubtype; +} MFT_REGISTER_TYPE_INFO; + +typedef enum _MFVideoFlags { + MFVideoFlag_PAD_TO_Mask = 0x00000003, + MFVideoFlag_PAD_TO_None = 0, + MFVideoFlag_PAD_TO_4x3 = 0x00000001, + MFVideoFlag_PAD_TO_16x9 = 0x00000002, + MFVideoFlag_SrcContentHintMask = 0x0000001c, + MFVideoFlag_SrcContentHintNone = 0, + MFVideoFlag_SrcContentHint16x9 = 0x00000004, + MFVideoFlag_SrcContentHint235_1 = 0x00000008, + MFVideoFlag_AnalogProtected = 0x00000020, + MFVideoFlag_DigitallyProtected = 0x00000040, + MFVideoFlag_ProgressiveContent = 0x00000080, + MFVideoFlag_FieldRepeatCountMask = 0x00000700, + MFVideoFlag_FieldRepeatCountShift = 8, + MFVideoFlag_ProgressiveSeqReset = 0x00000800, + MFVideoFlag_PanScanEnabled = 0x00020000, + MFVideoFlag_LowerFieldFirst = 0x00040000, + MFVideoFlag_BottomUpLinearRep = 0x00080000, + MFVideoFlags_DXVASurface = 0x00100000, + MFVideoFlags_RenderTargetSurface = 0x00400000, + MFVideoFlags_ForceQWORD = 0x7fffffff +} MFVideoFlags; + +typedef struct _MFRatio { + DWORD Numerator; + DWORD Denominator; +} MFRatio; + +typedef struct _MFOffset { + WORD fract; + short value; +} MFOffset; + +typedef struct _MFVideoArea { + MFOffset OffsetX; + MFOffset OffsetY; + SIZE Area; +} MFVideoArea; + +typedef enum _MFVideoChromaSubsampling { + MFVideoChromaSubsampling_Unknown = 0, + MFVideoChromaSubsampling_ProgressiveChroma = 0x8, + MFVideoChromaSubsampling_Horizontally_Cosited = 0x4, + MFVideoChromaSubsampling_Vertically_Cosited = 0x2, + MFVideoChromaSubsampling_Vertically_AlignedChromaPlanes = 0x1, + MFVideoChromaSubsampling_MPEG2 + = MFVideoChromaSubsampling_Horizontally_Cosited + | MFVideoChromaSubsampling_Vertically_AlignedChromaPlanes, + MFVideoChromaSubsampling_MPEG1 + = MFVideoChromaSubsampling_Vertically_AlignedChromaPlanes, + MFVideoChromaSubsampling_DV_PAL + = MFVideoChromaSubsampling_Horizontally_Cosited + | MFVideoChromaSubsampling_Vertically_Cosited, + MFVideoChromaSubsampling_Cosited + = MFVideoChromaSubsampling_Horizontally_Cosited + | MFVideoChromaSubsampling_Vertically_Cosited + | MFVideoChromaSubsampling_Vertically_AlignedChromaPlanes, + MFVideoChromaSubsampling_Last = MFVideoChromaSubsampling_Cosited + 1, + MFVideoChromaSubsampling_ForceDWORD = 0x7fffffff +} MFVideoChromaSubsampling; + +typedef enum _MFVideoInterlaceMode { + MFVideoInterlace_Unknown = 0, + MFVideoInterlace_Progressive = 2, + MFVideoInterlace_FieldInterleavedUpperFirst = 3, + MFVideoInterlace_FieldInterleavedLowerFirst = 4, + MFVideoInterlace_FieldSingleUpper = 5, + MFVideoInterlace_FieldSingleLower = 6, + MFVideoInterlace_MixedInterlaceOrProgressive = 7, + MFVideoInterlace_Last, + MFVideoInterlace_ForceDWORD = 0x7fffffff +} MFVideoInterlaceMode; + +typedef enum _MFVideoTransferFunction { + MFVideoTransFunc_Unknown = 0, + MFVideoTransFunc_10 = 1, + MFVideoTransFunc_18 = 2, + MFVideoTransFunc_20 = 3, + MFVideoTransFunc_22 = 4, + MFVideoTransFunc_709 = 5, + MFVideoTransFunc_240M = 6, + MFVideoTransFunc_sRGB = 7, + MFVideoTransFunc_28 = 8, + MFVideoTransFunc_Log_100 = 9, + MFVideoTransFunc_Log_316 = 10, + MFVideoTransFunc_709_sym = 11, + MFVideoTransFunc_Last, + MFVideoTransFunc_ForceDWORD = 0x7fffffff +} MFVideoTransferFunction; + +typedef enum _MFVideoTransferMatrix { + MFVideoTransferMatrix_Unknown = 0, + MFVideoTransferMatrix_BT709 = 1, + MFVideoTransferMatrix_BT601 = 2, + MFVideoTransferMatrix_SMPTE240M = 3, + MFVideoTransferMatrix_Last, + MFVideoTransferMatrix_ForceDWORD = 0x7fffffff +} MFVideoTransferMatrix; + +typedef enum _MFVideoPrimaries { + MFVideoPrimaries_Unknown = 0, + MFVideoPrimaries_reserved = 1, + MFVideoPrimaries_BT709 = 2, + MFVideoPrimaries_BT470_2_SysM = 3, + MFVideoPrimaries_BT470_2_SysBG = 4, + MFVideoPrimaries_SMPTE170M = 5, + MFVideoPrimaries_SMPTE240M = 6, + MFVideoPrimaries_EBU3213 = 7, + MFVideoPrimaries_SMPTE_C = 8, + MFVideoPrimaries_Last, + MFVideoPrimaries_ForceDWORD = 0x7fffffff +} MFVideoPrimaries; + +typedef enum _MFVideoLighting { + MFVideoLighting_Unknown = 0, + MFVideoLighting_bright = 1, + MFVideoLighting_office = 2, + MFVideoLighting_dim = 3, + MFVideoLighting_dark = 4, + MFVideoLighting_Last, + MFVideoLighting_ForceDWORD = 0x7fffffff +} MFVideoLighting; + +typedef enum _MFNominalRange { + MFNominalRange_Unknown = 0, + MFNominalRange_Normal = 1, + MFNominalRange_Wide = 2, + MFNominalRange_0_255 = 1, + MFNominalRange_16_235 = 2, + MFNominalRange_48_208 = 3, + MFNominalRange_64_127 = 4 +} MFNominalRange; + +typedef struct _MFVideoInfo { + DWORD dwWidth; + DWORD dwHeight; + MFRatio PixelAspectRatio; + MFVideoChromaSubsampling SourceChromaSubsampling; + MFVideoInterlaceMode InterlaceMode; + MFVideoTransferFunction TransferFunction; + MFVideoPrimaries ColorPrimaries; + MFVideoTransferMatrix TransferMatrix; + MFVideoLighting SourceLighting; + MFRatio FramesPerSecond; + MFNominalRange NominalRange; + MFVideoArea GeometricAperture; + MFVideoArea MinimumDisplayAperture; + MFVideoArea PanScanAperture; + unsigned __int64 VideoFlags; +} MFVideoInfo; + +typedef struct _MFVideoCompressedInfo { + LONGLONG AvgBitrate; + LONGLONG AvgBitErrorRate; + DWORD MaxKeyFrameSpacing; +} MFVideoCompressedInfo; + +typedef struct _MFARGB { + BYTE rgbBlue; + BYTE rgbGreen; + BYTE rgbRed; + BYTE rgbAlpha; +} MFARGB; + +typedef struct __MFAYUVSample { + BYTE bCrValue; + BYTE bCbValue; + BYTE bYValue; + BYTE bSampleAlpha8; +} MFAYUVSample; + +typedef union _MFPaletteEntry { + MFARGB ARGB; + MFAYUVSample AYCbCr; +} MFPaletteEntry; + +typedef struct _MFVideoSurfaceInfo { + DWORD Format; + DWORD PaletteEntries; + MFPaletteEntry Palette[]; +} MFVideoSurfaceInfo; + +typedef struct _MFVIDEOFORMAT { + DWORD dwSize; + MFVideoInfo videoInfo; + GUID guidFormat; + MFVideoCompressedInfo compressedInfo; + MFVideoSurfaceInfo surfaceInfo; +} MFVIDEOFORMAT; + +typedef enum _MFStandardVideoFormat { + MFStdVideoFormat_reserved = 0, + MFStdVideoFormat_NTSC, + MFStdVideoFormat_PAL, + MFStdVideoFormat_DVD_NTSC, + MFStdVideoFormat_DVD_PAL, + MFStdVideoFormat_DV_PAL, + MFStdVideoFormat_DV_NTSC, + MFStdVideoFormat_ATSC_SD480i, + MFStdVideoFormat_ATSC_HD1080i, + MFStdVideoFormat_ATSC_HD720p +} MFStandardVideoFormat; + +[ + object, + uuid(b99f381f-a8f9-47a2-a5af-ca3a225a3890), + local +] +interface IMFVideoMediaType : IMFMediaType +{ + const MFVIDEOFORMAT *GetVideoFormat(); + + HRESULT GetVideoRepresentation([in] GUID guidRepresentation, [out] LPVOID *ppvRepresentation, + [in] LONG lStride); +} + +[ + object, + uuid(ac6b7889-0740-4d51-8619-905994a55cc6) +] +interface IMFAsyncResult : IUnknown +{ + HRESULT GetState([out] IUnknown **ppunkState); + HRESULT GetStatus(); + HRESULT SetStatus([in] HRESULT hrStatus); + HRESULT GetObject([out] IUnknown **ppObject); + [local] IUnknown *GetStateNoAddRef(); +} + +[ + object, + uuid(a27003cf-2354-4f2a-8d6a-ab7cff15437e), +] +interface IMFAsyncCallback : IUnknown +{ + HRESULT GetParameters([out] DWORD *pdwFlags, [out] DWORD *pdwQueue); + HRESULT Invoke([in] IMFAsyncResult *pAsyncResult); +} + +[ + object, + uuid(a27003d0-2354-4f2a-8d6a-ab7cff15437e), +] +interface IMFRemoteAsyncCallback : IUnknown +{ + HRESULT Invoke([in] HRESULT hr, [in] IUnknown *pRemoteResult); +} + +cpp_quote("#define MFASYNC_FAST_IO_PROCESSING_CALLBACK 0x0001") +cpp_quote("#define MFASYNC_SIGNAL_CALLBACK 0x0002" ) + +cpp_quote("#define MFASYNC_CALLBACK_QUEUE_UNDEFINED 0x00000000") +cpp_quote("#define MFASYNC_CALLBACK_QUEUE_STANDARD 0x00000001") +cpp_quote("#define MFASYNC_CALLBACK_QUEUE_RT 0x00000002") +cpp_quote("#define MFASYNC_CALLBACK_QUEUE_IO 0x00000003") +cpp_quote("#define MFASYNC_CALLBACK_QUEUE_TIMER 0x00000004") +cpp_quote("#define MFASYNC_CALLBACK_QUEUE_LONG_FUNCTION 0x00000007") +cpp_quote("#define MFASYNC_CALLBACK_QUEUE_PRIVATE_MASK 0xffff0000") +cpp_quote("#define MFASYNC_CALLBACK_QUEUE_ALL 0xffffffff") + +typedef DWORD MediaEventType; + +[ + object, + uuid(df598932-f10c-4e39-bba2-c308f101daa3) +] +interface IMFMediaEvent : IMFAttributes +{ + HRESULT GetType([out] MediaEventType *pmet); + HRESULT GetExtendedType([out] GUID *pguidExtendedType); + HRESULT GetStatus([out] HRESULT *phrStatus); + HRESULT GetValue([out] PROPVARIANT *pvValue); +} + +[ + object, + uuid(2cd0bd52-bcd5-4b89-b62c-eadc0c031e7d) +] +interface IMFMediaEventGenerator : IUnknown +{ + HRESULT GetEvent([in] DWORD dwFlags, [out] IMFMediaEvent **ppEvent); + + [local] HRESULT BeginGetEvent([in] IMFAsyncCallback *pCallback, [in] IUnknown *punkState); + [call_as(BeginGetEvent)] HRESULT RemoteBeginGetEvent([in] IMFRemoteAsyncCallback *pCallback); + + [local] HRESULT EndGetEvent([in] IMFAsyncResult *pResult, [out] IMFMediaEvent **ppEvent); + [call_as(EndGetEvent)] HRESULT RemoteEndGetEvent([in] IUnknown *pResult, [out] DWORD *pcbEvent, + [out, size_is(,*pcbEvent)] BYTE **ppbEvent); + + HRESULT QueueEvent([in] MediaEventType met, [in] REFGUID guidExtendedType, [in] HRESULT hrStatus, + [in, unique] const PROPVARIANT *pvValue); +} + +typedef enum _MFBYTESTREAM_SEEK_ORIGIN { + msoBegin, + msoCurrent +} MFBYTESTREAM_SEEK_ORIGIN; + +[ + object, + uuid(ad4c1b00-4bf7-422f-9175-756693d9130d), +] +interface IMFByteStream : IUnknown +{ + HRESULT GetCapabilities([out] DWORD *pdwCapabilities); + HRESULT GetLength([out] QWORD *pqwLength); + HRESULT SetLength([in] QWORD qwLength); + HRESULT GetCurrentPosition([out] QWORD *pqwPosition); + HRESULT SetCurrentPosition([in] QWORD qwPosition); + HRESULT IsEndOfStream([out] BOOL *pfEndOfStream); + + [local] HRESULT Read([in] BYTE* pb, [in] ULONG cb, [out] ULONG *pcbRead); + [local] HRESULT BeginRead([in] BYTE *pb, [in] ULONG cb, [in] IMFAsyncCallback *pCallback, [in] IUnknown *punkState); + [local] HRESULT EndRead([in] IMFAsyncResult *pResult, [out] ULONG *pcbRead); + [local] HRESULT Write([in] const BYTE *pb, [in] ULONG cb, [out] ULONG *pcbWritten); + [local] HRESULT BeginWrite([in] const BYTE *pb, [in] ULONG cb, [in] IMFAsyncCallback *pCallback, [in] IUnknown *punkState); + [local] HRESULT EndWrite([in] IMFAsyncResult *pResult, [out] ULONG *pcbWritten); + [local] HRESULT Seek([in] MFBYTESTREAM_SEEK_ORIGIN SeekOrigin, [in] LONGLONG llSeekOffset, [in] DWORD dwSeekFlags, + [out] QWORD *pqwCurrentPosition); + + HRESULT Flush(); + HRESULT Close(); +} + +cpp_quote("#define MFBYTESTREAM_IS_READABLE 0x00000001") +cpp_quote("#define MFBYTESTREAM_IS_WRITABLE 0x00000002") +cpp_quote("#define MFBYTESTREAM_IS_SEEKABLE 0x00000004") +cpp_quote("#define MFBYTESTREAM_IS_REMOTE 0x00000008") +cpp_quote("#define MFBYTESTREAM_IS_DIRECTORY 0x00000080") +cpp_quote("#define MFBYTESTREAM_HAS_SLOW_SEEK 0x00000100") +cpp_quote("#define MFBYTESTREAM_IS_PARTIALLY_DOWNLOADED 0x00000200") +cpp_quote("#define MFBYTESTREAM_SHARE_WRITE 0x00000400") + +cpp_quote("#define MFBYTESTREAM_SEEK_FLAG_CANCEL_PENDING_IO 0x00000001") + +cpp_quote("EXTERN_GUID(MF_BYTESTREAM_ORIGIN_NAME, 0xfc358288,0x3cb6,0x460c,0xa4,0x24,0xb6,0x68,0x12,0x60,0x37,0x5a);") +cpp_quote("EXTERN_GUID(MF_BYTESTREAM_CONTENT_TYPE, 0xfc358289,0x3cb6,0x460c,0xa4,0x24,0xb6,0x68,0x12,0x60,0x37,0x5a);") +cpp_quote("EXTERN_GUID(MF_BYTESTREAM_DURATION, 0xfc35828a,0x3cb6,0x460c,0xa4,0x24,0xb6,0x68,0x12,0x60,0x37,0x5a);") +cpp_quote("EXTERN_GUID(MF_BYTESTREAM_LAST_MODIFIED_TIME, 0xfc35828b,0x3cb6,0x460c,0xa4,0x24,0xb6,0x68,0x12,0x60,0x37,0x5a);") +cpp_quote("EXTERN_GUID(MF_BYTESTREAM_IFO_FILE_URI, 0xfc35828c,0x3cb6,0x460c,0xa4,0x24,0xb6,0x68,0x12,0x60,0x37,0x5a);") +cpp_quote("EXTERN_GUID(MF_BYTESTREAM_DLNA_PROFILE_ID, 0xfc35828d,0x3cb6,0x460c,0xa4,0x24,0xb6,0x68,0x12,0x60,0x37,0x5a);") + +typedef enum MF_FILE_ACCESSMODE { + MF_ACCESSMODE_READ = 1, + MF_ACCESSMODE_WRITE = 2, + MF_ACCESSMODE_READWRITE = 3 +} MF_FILE_ACCESSMODE; + +typedef enum { + MF_OPENMODE_FAIL_IF_NOT_EXIST = 0, + MF_OPENMODE_FAIL_IF_EXIST = 1, + MF_OPENMODE_RESET_IF_EXIST = 2, + MF_OPENMODE_APPEND_IF_EXIST = 3, + MF_OPENMODE_DELETE_IF_EXIST = 4 +} MF_FILE_OPENMODE; + +typedef enum { + MF_FILEFLAGS_NONE = 0x00000000, + MF_FILEFLAGS_NOBUFFERING = 0x00000001, + MF_FILEFLAGS_ALLOW_WRITE_SHARING = 0x00000002 +} MF_FILE_FLAGS; + +[ + object, + uuid(5bc8a76b-869a-46a3-9b03-fa218a66aebe) +] +interface IMFCollection : IUnknown +{ + HRESULT GetElementCount([out] DWORD *pcElements); + HRESULT GetElement([in] DWORD dwElementIndex, [out] IUnknown **ppUnkElement); + HRESULT AddElement([in] IUnknown *pUnkElement); + HRESULT RemoveElement([in] DWORD dwElementIndex, [out] IUnknown **ppUnkElement); + HRESULT InsertElementAt([in] DWORD dwIndex, [in] IUnknown *pUnknown); + HRESULT RemoveAllElements(); +} + +[ + object, + uuid(7fee9e9a-4a89-47a6-899c-b6a53a70fb67), + pointer_default(unique) +] +interface IMFActivate : IMFAttributes +{ + HRESULT ActivateObject([in] REFIID riid, [out, iid_is(riid), retval] void **ppv); + HRESULT ShutdownObject(); + HRESULT DetachObject(); +} + +typedef enum _MF_Plugin_Type { + MF_Plugin_Type_MFT = 0, + MF_Plugin_Type_MediaSource = 1 +} MF_Plugin_Type; + +[ + object, + local, + uuid(5c6c44bf-1db6-435b-9249-e8cd10fdec96), + pointer_default(unique) +] +interface IMFPluginControl : IUnknown +{ + HRESULT GetPreferredClsid(DWORD pluginType, LPCWSTR selector, CLSID *clsid); + HRESULT GetPreferredClsidByIndex(DWORD pluginType, DWORD index, LPWSTR *selector, CLSID *clsid); + HRESULT SetPreferredClsid(DWORD pluginType, LPCWSTR selector, const CLSID *clsid); + HRESULT IsDisabled(DWORD pluginType, REFCLSID clsid); + HRESULT GetDisabledByIndex(DWORD pluginType, DWORD index, CLSID *clsid); + HRESULT SetDisabled(DWORD pluginType, REFCLSID clsid, BOOL disabled); +} diff --git a/sdk/include/psdk/mftransform.idl b/sdk/include/psdk/mftransform.idl new file mode 100644 index 0000000000..165cad4afd --- /dev/null +++ b/sdk/include/psdk/mftransform.idl @@ -0,0 +1,113 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "mfobjects.idl"; + +typedef struct _MFT_INPUT_STREAM_INFO +{ + LONGLONG hnsMaxLatency; + DWORD dwFlags; + DWORD cbSize; + DWORD cbMaxLookahead; + DWORD cbAlignment; +} MFT_INPUT_STREAM_INFO; + +typedef struct _MFT_OUTPUT_STREAM_INFO +{ + DWORD dwFlags; + DWORD cbSize; + DWORD cbAlignment; +} MFT_OUTPUT_STREAM_INFO; + +typedef struct _MFT_OUTPUT_DATA_BUFFER +{ + DWORD dwStreamID; + IMFSample *pSample; + DWORD dwStatus; + IMFCollection *pEvents; +} MFT_OUTPUT_DATA_BUFFER, *PMFT_OUTPUT_DATA_BUFFER; + +typedef enum _MFT_MESSAGE_TYPE +{ + MFT_MESSAGE_COMMAND_FLUSH = 0x00000000, + MFT_MESSAGE_COMMAND_DRAIN = 0x00000001, + MFT_MESSAGE_SET_D3D_MANAGER = 0x00000002, + MFT_MESSAGE_DROP_SAMPLES = 0x00000003, + MFT_MESSAGE_COMMAND_TICK = 0x00000004, + MFT_MESSAGE_NOTIFY_BEGIN_STREAMING = 0x10000000, + MFT_MESSAGE_NOTIFY_END_STREAMING = 0x10000001, + MFT_MESSAGE_NOTIFY_END_OF_STREAM = 0x10000002, + MFT_MESSAGE_NOTIFY_START_OF_STREAM = 0x10000003, + MFT_MESSAGE_COMMAND_MARKER = 0x20000000 +} MFT_MESSAGE_TYPE; + +[ + object, + uuid(bf94c121-5b05-4e6f-8000-ba598961414d) +] +interface IMFTransform : IUnknown +{ + HRESULT GetStreamLimits([out] DWORD *input_minimum, [out] DWORD *input_maximum, [out] DWORD *output_minimum, + [out] DWORD *output_maximum); + + HRESULT GetStreamCount([out] DWORD *inputs, [out] DWORD *outputs); + + HRESULT GetStreamIDs([in] DWORD input_size, [out,size_is(input_size)] DWORD *inputs, + [in] DWORD output_size, [out,size_is(output_size)] DWORD *outputs); + + HRESULT GetInputStreamInfo([in] DWORD id, [out] MFT_INPUT_STREAM_INFO *info); + + HRESULT GetOutputStreamInfo([in] DWORD id, [out] MFT_OUTPUT_STREAM_INFO *info); + + HRESULT GetAttributes([out] IMFAttributes **attributes); + + HRESULT GetInputStreamAttributes([in] DWORD id, [out] IMFAttributes **attributes); + + HRESULT GetOutputStreamAttributes([in] DWORD id, [out] IMFAttributes **attributes); + + HRESULT DeleteInputStream([in] DWORD id); + + HRESULT AddInputStreams([in] DWORD streams, [in] DWORD *ids); + + HRESULT GetInputAvailableType([in] DWORD id, [in] DWORD index, [out] IMFMediaType **type); + + HRESULT GetOutputAvailableType([in] DWORD id, [in] DWORD index, [out] IMFMediaType **type); + + HRESULT SetInputType(DWORD id, [in] IMFMediaType *type, [in] DWORD flags); + + HRESULT SetOutputType(DWORD id, [in] IMFMediaType *type, [in] DWORD flags); + + HRESULT GetInputCurrentType([in] DWORD id, [out] IMFMediaType **type); + + HRESULT GetOutputCurrentType([in] DWORD id, [out] IMFMediaType **type); + + HRESULT GetInputStatus([in] DWORD id, [out] DWORD *flags); + + HRESULT GetOutputStatus([out] DWORD *flags); + + HRESULT SetOutputBounds([in] LONGLONG lower, [in] LONGLONG upper); + + HRESULT ProcessEvent([in] DWORD id, [in] IMFMediaEvent *event); + + HRESULT ProcessMessage([in] MFT_MESSAGE_TYPE message, [in] ULONG_PTR param); + + [local] HRESULT ProcessInput([in] DWORD id, [in] IMFSample *sample, [in] DWORD flags); + + [local] HRESULT ProcessOutput([in] DWORD flags, [in] DWORD count, [in,out,size_is(count)] MFT_OUTPUT_DATA_BUFFER *samples, + [out] DWORD *status); +}; diff --git a/sdk/include/psdk/nserror.h b/sdk/include/psdk/nserror.h new file mode 100644 index 0000000000..00f267d513 --- /dev/null +++ b/sdk/include/psdk/nserror.h @@ -0,0 +1,1266 @@ +/* + * Copyright (C) 2017 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _NSERROR_H +#define _NSERROR_H + +/* Facility codes */ +#define FACILITY_NS_WIN32 0x7 +#define FACILITY_NS 0xD + +/* Severity codes */ +#define STATUS_SEVERITY_WARNING 0x2 +#define STATUS_SEVERITY_SUCCESS 0x0 +#define STATUS_SEVERITY_INFORMATIONAL 0x1 +#define STATUS_SEVERITY_ERROR 0x3 + +/* Success events */ +#define NS_S_CALLPENDING _HRESULT_TYPEDEF_(0x000d0000) +#define NS_S_CALLABORTED _HRESULT_TYPEDEF_(0x000d0001) +#define NS_S_STREAM_TRUNCATED _HRESULT_TYPEDEF_(0x000d0002) + +/* Warning events */ +#define NS_W_SERVER_BANDWIDTH_LIMIT _HRESULT_TYPEDEF_(0x800d0003) +#define NS_W_FILE_BANDWIDTH_LIMIT _HRESULT_TYPEDEF_(0x800d0004) + +/* Error events */ +#define NS_E_NOCONNECTION _HRESULT_TYPEDEF_(0xc00d0005) +#define NS_E_CANNOTCONNECT _HRESULT_TYPEDEF_(0xc00d0006) +#define NS_E_CANNOTDESTROYTITLE _HRESULT_TYPEDEF_(0xc00d0007) +#define NS_E_CANNOTRENAMETITLE _HRESULT_TYPEDEF_(0xc00d0008) +#define NS_E_CANNOTOFFLINEDISK _HRESULT_TYPEDEF_(0xc00d0009) +#define NS_E_CANNOTONLINEDISK _HRESULT_TYPEDEF_(0xc00d000a) +#define NS_E_NOREGISTEREDWALKER _HRESULT_TYPEDEF_(0xc00d000b) +#define NS_E_NOFUNNEL _HRESULT_TYPEDEF_(0xc00d000c) +#define NS_E_NO_LOCALPLAY _HRESULT_TYPEDEF_(0xc00d000d) +#define NS_E_NETWORK_BUSY _HRESULT_TYPEDEF_(0xc00d000e) +#define NS_E_TOO_MANY_SESS _HRESULT_TYPEDEF_(0xc00d000f) +#define NS_E_ALREADY_CONNECTED _HRESULT_TYPEDEF_(0xc00d0010) +#define NS_E_INVALID_INDEX _HRESULT_TYPEDEF_(0xc00d0011) +#define NS_E_PROTOCOL_MISMATCH _HRESULT_TYPEDEF_(0xc00d0012) +#define NS_E_TIMEOUT _HRESULT_TYPEDEF_(0xc00d0013) +#define NS_E_NET_WRITE _HRESULT_TYPEDEF_(0xc00d0014) +#define NS_E_NET_READ _HRESULT_TYPEDEF_(0xc00d0015) +#define NS_E_DISK_WRITE _HRESULT_TYPEDEF_(0xc00d0016) +#define NS_E_DISK_READ _HRESULT_TYPEDEF_(0xc00d0017) +#define NS_E_FILE_WRITE _HRESULT_TYPEDEF_(0xc00d0018) +#define NS_E_FILE_READ _HRESULT_TYPEDEF_(0xc00d0019) +#define NS_E_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d001a) +#define NS_E_FILE_EXISTS _HRESULT_TYPEDEF_(0xc00d001b) +#define NS_E_INVALID_NAME _HRESULT_TYPEDEF_(0xc00d001c) +#define NS_E_FILE_OPEN_FAILED _HRESULT_TYPEDEF_(0xc00d001d) +#define NS_E_FILE_ALLOCATION_FAILED _HRESULT_TYPEDEF_(0xc00d001e) +#define NS_E_FILE_INIT_FAILED _HRESULT_TYPEDEF_(0xc00d001f) +#define NS_E_FILE_PLAY_FAILED _HRESULT_TYPEDEF_(0xc00d0020) +#define NS_E_SET_DISK_UID_FAILED _HRESULT_TYPEDEF_(0xc00d0021) +#define NS_E_INDUCED _HRESULT_TYPEDEF_(0xc00d0022) +#define NS_E_CCLINK_DOWN _HRESULT_TYPEDEF_(0xc00d0023) +#define NS_E_INTERNAL _HRESULT_TYPEDEF_(0xc00d0024) +#define NS_E_BUSY _HRESULT_TYPEDEF_(0xc00d0025) +#define NS_E_UNRECOGNIZED_STREAM_TYPE _HRESULT_TYPEDEF_(0xc00d0026) +#define NS_E_NETWORK_SERVICE_FAILURE _HRESULT_TYPEDEF_(0xc00d0027) +#define NS_E_NETWORK_RESOURCE_FAILURE _HRESULT_TYPEDEF_(0xc00d0028) +#define NS_E_CONNECTION_FAILURE _HRESULT_TYPEDEF_(0xc00d0029) +#define NS_E_SHUTDOWN _HRESULT_TYPEDEF_(0xc00d002a) +#define NS_E_INVALID_REQUEST _HRESULT_TYPEDEF_(0xc00d002b) +#define NS_E_INSUFFICIENT_BANDWIDTH _HRESULT_TYPEDEF_(0xc00d002c) +#define NS_E_NOT_REBUILDING _HRESULT_TYPEDEF_(0xc00d002d) +#define NS_E_LATE_OPERATION _HRESULT_TYPEDEF_(0xc00d002e) +#define NS_E_INVALID_DATA _HRESULT_TYPEDEF_(0xc00d002f) +#define NS_E_FILE_BANDWIDTH_LIMIT _HRESULT_TYPEDEF_(0xc00d0030) +#define NS_E_OPEN_FILE_LIMIT _HRESULT_TYPEDEF_(0xc00d0031) +#define NS_E_BAD_CONTROL_DATA _HRESULT_TYPEDEF_(0xc00d0032) +#define NS_E_NO_STREAM _HRESULT_TYPEDEF_(0xc00d0033) +#define NS_E_STREAM_END _HRESULT_TYPEDEF_(0xc00d0034) +#define NS_E_SERVER_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d0035) +#define NS_E_DUPLICATE_NAME _HRESULT_TYPEDEF_(0xc00d0036) +#define NS_E_DUPLICATE_ADDRESS _HRESULT_TYPEDEF_(0xc00d0037) +#define NS_E_BAD_MULTICAST_ADDRESS _HRESULT_TYPEDEF_(0xc00d0038) +#define NS_E_BAD_ADAPTER_ADDRESS _HRESULT_TYPEDEF_(0xc00d0039) +#define NS_E_BAD_DELIVERY_MODE _HRESULT_TYPEDEF_(0xc00d003a) +#define NS_E_INVALID_CHANNEL _HRESULT_TYPEDEF_(0xc00d003b) +#define NS_E_INVALID_STREAM _HRESULT_TYPEDEF_(0xc00d003c) +#define NS_E_INVALID_ARCHIVE _HRESULT_TYPEDEF_(0xc00d003d) +#define NS_E_NOTITLES _HRESULT_TYPEDEF_(0xc00d003e) +#define NS_E_INVALID_CLIENT _HRESULT_TYPEDEF_(0xc00d003f) +#define NS_E_INVALID_BLACKHOLE_ADDRESS _HRESULT_TYPEDEF_(0xc00d0040) +#define NS_E_INCOMPATIBLE_FORMAT _HRESULT_TYPEDEF_(0xc00d0041) +#define NS_E_INVALID_KEY _HRESULT_TYPEDEF_(0xc00d0042) +#define NS_E_INVALID_PORT _HRESULT_TYPEDEF_(0xc00d0043) +#define NS_E_INVALID_TTL _HRESULT_TYPEDEF_(0xc00d0044) +#define NS_E_STRIDE_REFUSED _HRESULT_TYPEDEF_(0xc00d0045) +#define NS_E_MMSAUTOSERVER_CANTFINDWALKER _HRESULT_TYPEDEF_(0xc00d0046) +#define NS_E_MAX_BITRATE _HRESULT_TYPEDEF_(0xc00d0047) +#define NS_E_LOGFILEPERIOD _HRESULT_TYPEDEF_(0xc00d0048) +#define NS_E_MAX_CLIENTS _HRESULT_TYPEDEF_(0xc00d0049) +#define NS_E_LOG_FILE_SIZE _HRESULT_TYPEDEF_(0xc00d004a) +#define NS_E_MAX_FILERATE _HRESULT_TYPEDEF_(0xc00d004b) +#define NS_E_WALKER_UNKNOWN _HRESULT_TYPEDEF_(0xc00d004c) +#define NS_E_WALKER_SERVER _HRESULT_TYPEDEF_(0xc00d004d) +#define NS_E_WALKER_USAGE _HRESULT_TYPEDEF_(0xc00d004e) + +/* Monitor events */ +#define NS_I_TIGER_START _HRESULT_TYPEDEF_(0x400d004f) +#define NS_E_TIGER_FAIL _HRESULT_TYPEDEF_(0xc00d0050) +#define NS_I_CUB_START _HRESULT_TYPEDEF_(0x400d0051) +#define NS_I_CUB_RUNNING _HRESULT_TYPEDEF_(0x400d0052) +#define NS_E_CUB_FAIL _HRESULT_TYPEDEF_(0xc00d0053) +#define NS_I_DISK_START _HRESULT_TYPEDEF_(0x400d0054) +#define NS_E_DISK_FAIL _HRESULT_TYPEDEF_(0xc00d0055) +#define NS_I_DISK_REBUILD_STARTED _HRESULT_TYPEDEF_(0x400d0056) +#define NS_I_DISK_REBUILD_FINISHED _HRESULT_TYPEDEF_(0x400d0057) +#define NS_I_DISK_REBUILD_ABORTED _HRESULT_TYPEDEF_(0x400d0058) +#define NS_I_LIMIT_FUNNELS _HRESULT_TYPEDEF_(0x400d0059) +#define NS_I_START_DISK _HRESULT_TYPEDEF_(0x400d005a) +#define NS_I_STOP_DISK _HRESULT_TYPEDEF_(0x400d005b) +#define NS_I_STOP_CUB _HRESULT_TYPEDEF_(0x400d005c) +#define NS_I_KILL_USERSESSION _HRESULT_TYPEDEF_(0x400d005d) +#define NS_I_KILL_CONNECTION _HRESULT_TYPEDEF_(0x400d005e) +#define NS_I_REBUILD_DISK _HRESULT_TYPEDEF_(0x400d005f) +#define NS_W_UNKNOWN_EVENT _HRESULT_TYPEDEF_(0x800d0060) +#define NS_E_MAX_FUNNELS_ALERT _HRESULT_TYPEDEF_(0xc00d0060) +#define NS_E_ALLOCATE_FILE_FAIL _HRESULT_TYPEDEF_(0xc00d0061) +#define NS_E_PAGING_ERROR _HRESULT_TYPEDEF_(0xc00d0062) +#define NS_E_BAD_BLOCK0_VERSION _HRESULT_TYPEDEF_(0xc00d0063) +#define NS_E_BAD_DISK_UID _HRESULT_TYPEDEF_(0xc00d0064) +#define NS_E_BAD_FSMAJOR_VERSION _HRESULT_TYPEDEF_(0xc00d0065) +#define NS_E_BAD_STAMPNUMBER _HRESULT_TYPEDEF_(0xc00d0066) +#define NS_E_PARTIALLY_REBUILT_DISK _HRESULT_TYPEDEF_(0xc00d0067) +#define NS_E_ENACTPLAN_GIVEUP _HRESULT_TYPEDEF_(0xc00d0068) +#define MCMADM_I_NO_EVENTS _HRESULT_TYPEDEF_(0x400d0069) +#define MCMADM_E_REGKEY_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d006a) +#define NS_E_NO_FORMATS _HRESULT_TYPEDEF_(0xc00d006b) +#define NS_E_NO_REFERENCES _HRESULT_TYPEDEF_(0xc00d006c) +#define NS_E_WAVE_OPEN _HRESULT_TYPEDEF_(0xc00d006d) +#define NS_I_LOGGING_FAILED _HRESULT_TYPEDEF_(0x400d006e) +#define NS_E_CANNOTCONNECTEVENTS _HRESULT_TYPEDEF_(0xc00d006f) +#define NS_I_LIMIT_BANDWIDTH _HRESULT_TYPEDEF_(0x400d0070) +#define NS_E_NO_DEVICE _HRESULT_TYPEDEF_(0xc00d0071) +#define NS_E_NO_SPECIFIED_DEVICE _HRESULT_TYPEDEF_(0xc00d0072) +#define NS_E_NOTHING_TO_DO _HRESULT_TYPEDEF_(0xc00d07f1) +#define NS_E_NO_MULTICAST _HRESULT_TYPEDEF_(0xc00d07f2) + +/* Error events */ +#define NS_E_MONITOR_GIVEUP _HRESULT_TYPEDEF_(0xc00d00c8) +#define NS_E_REMIRRORED_DISK _HRESULT_TYPEDEF_(0xc00d00c9) +#define NS_E_INSUFFICIENT_DATA _HRESULT_TYPEDEF_(0xc00d00ca) +#define NS_E_ASSERT _HRESULT_TYPEDEF_(0xc00d00cb) +#define NS_E_BAD_ADAPTER_NAME _HRESULT_TYPEDEF_(0xc00d00cc) +#define NS_E_NOT_LICENSED _HRESULT_TYPEDEF_(0xc00d00cd) +#define NS_E_NO_SERVER_CONTACT _HRESULT_TYPEDEF_(0xc00d00ce) +#define NS_E_TOO_MANY_TITLES _HRESULT_TYPEDEF_(0xc00d00cf) +#define NS_E_TITLE_SIZE_EXCEEDED _HRESULT_TYPEDEF_(0xc00d00d0) +#define NS_E_UDP_DISABLED _HRESULT_TYPEDEF_(0xc00d00d1) +#define NS_E_TCP_DISABLED _HRESULT_TYPEDEF_(0xc00d00d2) +#define NS_E_HTTP_DISABLED _HRESULT_TYPEDEF_(0xc00d00d3) +#define NS_E_LICENSE_EXPIRED _HRESULT_TYPEDEF_(0xc00d00d4) +#define NS_E_TITLE_BITRATE _HRESULT_TYPEDEF_(0xc00d00d5) +#define NS_E_EMPTY_PROGRAM_NAME _HRESULT_TYPEDEF_(0xc00d00d6) +#define NS_E_MISSING_CHANNEL _HRESULT_TYPEDEF_(0xc00d00d7) +#define NS_E_NO_CHANNELS _HRESULT_TYPEDEF_(0xc00d00d8) +#define NS_E_INVALID_INDEX2 _HRESULT_TYPEDEF_(0xc00d00d9) + +/* (More) error events */ +#define NS_E_CUB_FAIL_LINK _HRESULT_TYPEDEF_(0xc00d0190) +#define NS_I_CUB_UNFAIL_LINK _HRESULT_TYPEDEF_(0x400d0191) +#define NS_E_BAD_CUB_UID _HRESULT_TYPEDEF_(0xc00d0192) +#define NS_I_RESTRIPE_START _HRESULT_TYPEDEF_(0x400d0193) +#define NS_I_RESTRIPE_DONE _HRESULT_TYPEDEF_(0x400d0194) +#define NS_E_GLITCH_MODE _HRESULT_TYPEDEF_(0xc00d0195) +#define NS_I_RESTRIPE_DISK_OUT _HRESULT_TYPEDEF_(0x400d0196) +#define NS_I_RESTRIPE_CUB_OUT _HRESULT_TYPEDEF_(0x400d0197) +#define NS_I_DISK_STOP _HRESULT_TYPEDEF_(0x400d0198) +#define NS_I_CATATONIC_FAILURE _HRESULT_TYPEDEF_(0x800d0199) +#define NS_I_CATATONIC_AUTO_UNFAIL _HRESULT_TYPEDEF_(0x800d019a) +#define NS_E_NO_MEDIA_PROTOCOL _HRESULT_TYPEDEF_(0xc00d019b) + +/* WMSDK errors */ +#define NS_E_INVALID_INPUT_FORMAT _HRESULT_TYPEDEF_(0xc00d0bb8) +#define NS_E_MSAUDIO_NOT_INSTALLED _HRESULT_TYPEDEF_(0xc00d0bb9) +#define NS_E_UNEXPECTED_MSAUDIO_ERROR _HRESULT_TYPEDEF_(0xc00d0bba) +#define NS_E_INVALID_OUTPUT_FORMAT _HRESULT_TYPEDEF_(0xc00d0bbb) +#define NS_E_NOT_CONFIGURED _HRESULT_TYPEDEF_(0xc00d0bbc) +#define NS_E_PROTECTED_CONTENT _HRESULT_TYPEDEF_(0xc00d0bbd) +#define NS_E_LICENSE_REQUIRED _HRESULT_TYPEDEF_(0xc00d0bbe) +#define NS_E_TAMPERED_CONTENT _HRESULT_TYPEDEF_(0xc00d0bbf) +#define NS_E_LICENSE_OUTOFDATE _HRESULT_TYPEDEF_(0xc00d0bc0) +#define NS_E_LICENSE_INCORRECT_RIGHTS _HRESULT_TYPEDEF_(0xc00d0bc1) +#define NS_E_AUDIO_CODEC_NOT_INSTALLED _HRESULT_TYPEDEF_(0xc00d0bc2) +#define NS_E_AUDIO_CODEC_ERROR _HRESULT_TYPEDEF_(0xc00d0bc3) +#define NS_E_VIDEO_CODEC_NOT_INSTALLED _HRESULT_TYPEDEF_(0xc00d0bc4) +#define NS_E_VIDEO_CODEC_ERROR _HRESULT_TYPEDEF_(0xc00d0bc5) +#define NS_E_INVALIDPROFILE _HRESULT_TYPEDEF_(0xc00d0bc6) +#define NS_E_INCOMPATIBLE_VERSION _HRESULT_TYPEDEF_(0xc00d0bc7) +#define NS_S_REBUFFERING _HRESULT_TYPEDEF_(0x000d0bc8) +#define NS_S_DEGRADING_QUALITY _HRESULT_TYPEDEF_(0x000d0bc9) +#define NS_E_OFFLINE_MODE _HRESULT_TYPEDEF_(0xc00d0bca) +#define NS_E_NOT_CONNECTED _HRESULT_TYPEDEF_(0xc00d0bcb) +#define NS_E_TOO_MUCH_DATA _HRESULT_TYPEDEF_(0xc00d0bcc) +#define NS_E_UNSUPPORTED_PROPERTY _HRESULT_TYPEDEF_(0xc00d0bcd) +#define NS_E_8BIT_WAVE_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d0bce) +#define NS_E_NO_MORE_SAMPLES _HRESULT_TYPEDEF_(0xc00d0bcf) +#define NS_E_INVALID_SAMPLING_RATE _HRESULT_TYPEDEF_(0xc00d0bd0) +#define NS_E_MAX_PACKET_SIZE_TOO_SMALL _HRESULT_TYPEDEF_(0xc00d0bd1) +#define NS_E_LATE_PACKET _HRESULT_TYPEDEF_(0xc00d0bd2) +#define NS_E_DUPLICATE_PACKET _HRESULT_TYPEDEF_(0xc00d0bd3) +#define NS_E_SDK_BUFFERTOOSMALL _HRESULT_TYPEDEF_(0xc00d0bd4) +#define NS_E_INVALID_NUM_PASSES _HRESULT_TYPEDEF_(0xc00d0bd5) +#define NS_E_ATTRIBUTE_READ_ONLY _HRESULT_TYPEDEF_(0xc00d0bd6) +#define NS_E_ATTRIBUTE_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d0bd7) +#define NS_E_INVALID_EDL _HRESULT_TYPEDEF_(0xc00d0bd8) +#define NS_E_DATA_UNIT_EXTENSION_TOO_LARGE _HRESULT_TYPEDEF_(0xc00d0bd9) +#define NS_E_CODEC_DMO_ERROR _HRESULT_TYPEDEF_(0xc00d0bda) +#define NS_S_TRANSCRYPTOR_EOF _HRESULT_TYPEDEF_(0x000d0bdb) +#define NS_E_FEATURE_DISABLED_BY_GROUP_POLICY _HRESULT_TYPEDEF_(0xc00d0bdc) +#define NS_E_FEATURE_DISABLED_IN_SKU _HRESULT_TYPEDEF_(0xc00d0bdd) + +/* WMP errors */ +#define NS_E_NO_CD _HRESULT_TYPEDEF_(0xc00d0fa0) +#define NS_E_CANT_READ_DIGITAL _HRESULT_TYPEDEF_(0xc00d0fa1) +#define NS_E_DEVICE_DISCONNECTED _HRESULT_TYPEDEF_(0xc00d0fa2) +#define NS_E_DEVICE_NOT_SUPPORT_FORMAT _HRESULT_TYPEDEF_(0xc00d0fa3) +#define NS_E_SLOW_READ_DIGITAL _HRESULT_TYPEDEF_(0xc00d0fa4) +#define NS_E_MIXER_INVALID_LINE _HRESULT_TYPEDEF_(0xc00d0fa5) +#define NS_E_MIXER_INVALID_CONTROL _HRESULT_TYPEDEF_(0xc00d0fa6) +#define NS_E_MIXER_INVALID_VALUE _HRESULT_TYPEDEF_(0xc00d0fa7) +#define NS_E_MIXER_UNKNOWN_MMRESULT _HRESULT_TYPEDEF_(0xc00d0fa8) +#define NS_E_USER_STOP _HRESULT_TYPEDEF_(0xc00d0fa9) +#define NS_E_MP3_FORMAT_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d0faa) +#define NS_E_CD_READ_ERROR_NO_CORRECTION _HRESULT_TYPEDEF_(0xc00d0fab) +#define NS_E_CD_READ_ERROR _HRESULT_TYPEDEF_(0xc00d0fac) +#define NS_E_CD_SLOW_COPY _HRESULT_TYPEDEF_(0xc00d0fad) +#define NS_E_CD_COPYTO_CD _HRESULT_TYPEDEF_(0xc00d0fae) +#define NS_E_MIXER_NODRIVER _HRESULT_TYPEDEF_(0xc00d0faf) +#define NS_E_REDBOOK_ENABLED_WHILE_COPYING _HRESULT_TYPEDEF_(0xc00d0fb0) +#define NS_E_CD_REFRESH _HRESULT_TYPEDEF_(0xc00d0fb1) +#define NS_E_CD_DRIVER_PROBLEM _HRESULT_TYPEDEF_(0xc00d0fb2) +#define NS_E_WONT_DO_DIGITAL _HRESULT_TYPEDEF_(0xc00d0fb3) +#define NS_E_WMPXML_NOERROR _HRESULT_TYPEDEF_(0xc00d0fb4) +#define NS_E_WMPXML_ENDOFDATA _HRESULT_TYPEDEF_(0xc00d0fb5) +#define NS_E_WMPXML_PARSEERROR _HRESULT_TYPEDEF_(0xc00d0fb6) +#define NS_E_WMPXML_ATTRIBUTENOTFOUND _HRESULT_TYPEDEF_(0xc00d0fb7) +#define NS_E_WMPXML_PINOTFOUND _HRESULT_TYPEDEF_(0xc00d0fb8) +#define NS_E_WMPXML_EMPTYDOC _HRESULT_TYPEDEF_(0xc00d0fb9) +#define NS_E_WMP_PATH_ALREADY_IN_LIBRARY _HRESULT_TYPEDEF_(0xc00d0fba) +#define NS_E_WMP_FILESCANALREADYSTARTED _HRESULT_TYPEDEF_(0xc00d0fbe) +#define NS_E_WMP_HME_INVALIDOBJECTID _HRESULT_TYPEDEF_(0xc00d0fbf) +#define NS_E_WMP_MF_CODE_EXPIRED _HRESULT_TYPEDEF_(0xc00d0fc0) +#define NS_E_WMP_HME_NOTSEARCHABLEFORITEMS _HRESULT_TYPEDEF_(0xc00d0fc1) +#define NS_E_WMP_HME_STALEREQUEST _HRESULT_TYPEDEF_(0xc00d0fc2) +#define NS_E_WMP_ADDTOLIBRARY_FAILED _HRESULT_TYPEDEF_(0xc00d0fc7) +#define NS_E_WMP_WINDOWSAPIFAILURE _HRESULT_TYPEDEF_(0xc00d0fc8) +#define NS_E_WMP_RECORDING_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d0fc9) +#define NS_E_DEVICE_NOT_READY _HRESULT_TYPEDEF_(0xc00d0fca) +#define NS_E_DAMAGED_FILE _HRESULT_TYPEDEF_(0xc00d0fcb) +#define NS_E_MPDB_GENERIC _HRESULT_TYPEDEF_(0xc00d0fcc) +#define NS_E_FILE_FAILED_CHECKS _HRESULT_TYPEDEF_(0xc00d0fcd) +#define NS_E_MEDIA_LIBRARY_FAILED _HRESULT_TYPEDEF_(0xc00d0fce) +#define NS_E_SHARING_VIOLATION _HRESULT_TYPEDEF_(0xc00d0fcf) +#define NS_E_NO_ERROR_STRING_FOUND _HRESULT_TYPEDEF_(0xc00d0fd0) +#define NS_E_WMPOCX_NO_REMOTE_CORE _HRESULT_TYPEDEF_(0xc00d0fd1) +#define NS_E_WMPOCX_NO_ACTIVE_CORE _HRESULT_TYPEDEF_(0xc00d0fd2) +#define NS_E_WMPOCX_NOT_RUNNING_REMOTELY _HRESULT_TYPEDEF_(0xc00d0fd3) +#define NS_E_WMPOCX_NO_REMOTE_WINDOW _HRESULT_TYPEDEF_(0xc00d0fd4) +#define NS_E_WMPOCX_ERRORMANAGERNOTAVAILABLE _HRESULT_TYPEDEF_(0xc00d0fd5) +#define NS_E_PLUGIN_NOTSHUTDOWN _HRESULT_TYPEDEF_(0xc00d0fd6) +#define NS_E_WMP_CANNOT_FIND_FOLDER _HRESULT_TYPEDEF_(0xc00d0fd7) +#define NS_E_WMP_STREAMING_RECORDING_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d0fd8) +#define NS_E_WMP_PLUGINDLL_NOTFOUND _HRESULT_TYPEDEF_(0xc00d0fd9) +#define NS_E_NEED_TO_ASK_USER _HRESULT_TYPEDEF_(0xc00d0fda) +#define NS_E_WMPOCX_PLAYER_NOT_DOCKED _HRESULT_TYPEDEF_(0xc00d0fdb) +#define NS_E_WMP_EXTERNAL_NOTREADY _HRESULT_TYPEDEF_(0xc00d0fdc) +#define NS_E_WMP_MLS_STALE_DATA _HRESULT_TYPEDEF_(0xc00d0fdd) +#define NS_E_WMP_UI_SUBCONTROLSNOTSUPPORTED _HRESULT_TYPEDEF_(0xc00d0fde) +#define NS_E_WMP_UI_VERSIONMISMATCH _HRESULT_TYPEDEF_(0xc00d0fdf) +#define NS_E_WMP_UI_NOTATHEMEFILE _HRESULT_TYPEDEF_(0xc00d0fe0) +#define NS_E_WMP_UI_SUBELEMENTNOTFOUND _HRESULT_TYPEDEF_(0xc00d0fe1) +#define NS_E_WMP_UI_VERSIONPARSE _HRESULT_TYPEDEF_(0xc00d0fe2) +#define NS_E_WMP_UI_VIEWIDNOTFOUND _HRESULT_TYPEDEF_(0xc00d0fe3) +#define NS_E_WMP_UI_PASSTHROUGH _HRESULT_TYPEDEF_(0xc00d0fe4) +#define NS_E_WMP_UI_OBJECTNOTFOUND _HRESULT_TYPEDEF_(0xc00d0fe5) +#define NS_E_WMP_UI_SECONDHANDLER _HRESULT_TYPEDEF_(0xc00d0fe6) +#define NS_E_WMP_UI_NOSKININZIP _HRESULT_TYPEDEF_(0xc00d0fe7) +#define NS_S_WMP_UI_VERSIONMISMATCH _HRESULT_TYPEDEF_(0x000d0fe8) +#define NS_S_WMP_EXCEPTION _HRESULT_TYPEDEF_(0x000d0fe9) +#define NS_E_WMP_URLDOWNLOADFAILED _HRESULT_TYPEDEF_(0xc00d0fea) +#define NS_E_WMPOCX_UNABLE_TO_LOAD_SKIN _HRESULT_TYPEDEF_(0xc00d0feb) +#define NS_E_WMP_INVALID_SKIN _HRESULT_TYPEDEF_(0xc00d0fec) +#define NS_E_WMP_SENDMAILFAILED _HRESULT_TYPEDEF_(0xc00d0fed) +#define NS_E_WMP_LOCKEDINSKINMODE _HRESULT_TYPEDEF_(0xc00d0fee) +#define NS_E_WMP_FAILED_TO_SAVE_FILE _HRESULT_TYPEDEF_(0xc00d0fef) +#define NS_E_WMP_SAVEAS_READONLY _HRESULT_TYPEDEF_(0xc00d0ff0) +#define NS_E_WMP_FAILED_TO_SAVE_PLAYLIST _HRESULT_TYPEDEF_(0xc00d0ff1) +#define NS_E_WMP_FAILED_TO_OPEN_WMD _HRESULT_TYPEDEF_(0xc00d0ff2) +#define NS_E_WMP_CANT_PLAY_PROTECTED _HRESULT_TYPEDEF_(0xc00d0ff3) +#define NS_E_SHARING_STATE_OUT_OF_SYNC _HRESULT_TYPEDEF_(0xc00d0ff4) +#define NS_E_WMPOCX_REMOTE_PLAYER_ALREADY_RUNNING _HRESULT_TYPEDEF_(0xc00d0ffa) +#define NS_E_WMP_RBC_JPGMAPPINGIMAGE _HRESULT_TYPEDEF_(0xc00d1004) +#define NS_E_WMP_JPGTRANSPARENCY _HRESULT_TYPEDEF_(0xc00d1005) +#define NS_E_WMP_INVALID_MAX_VAL _HRESULT_TYPEDEF_(0xc00d1009) +#define NS_E_WMP_INVALID_MIN_VAL _HRESULT_TYPEDEF_(0xc00d100a) +#define NS_E_WMP_CS_JPGPOSITIONIMAGE _HRESULT_TYPEDEF_(0xc00d100e) +#define NS_E_WMP_CS_NOTEVENLYDIVISIBLE _HRESULT_TYPEDEF_(0xc00d100f) +#define NS_E_WMPZIP_NOTAZIPFILE _HRESULT_TYPEDEF_(0xc00d1018) +#define NS_E_WMPZIP_CORRUPT _HRESULT_TYPEDEF_(0xc00d1019) +#define NS_E_WMPZIP_FILENOTFOUND _HRESULT_TYPEDEF_(0xc00d101a) +#define NS_E_WMP_IMAGE_FILETYPE_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d1022) +#define NS_E_WMP_IMAGE_INVALID_FORMAT _HRESULT_TYPEDEF_(0xc00d1023) +#define NS_E_WMP_GIF_UNEXPECTED_ENDOFFILE _HRESULT_TYPEDEF_(0xc00d1024) +#define NS_E_WMP_GIF_INVALID_FORMAT _HRESULT_TYPEDEF_(0xc00d1025) +#define NS_E_WMP_GIF_BAD_VERSION_NUMBER _HRESULT_TYPEDEF_(0xc00d1026) +#define NS_E_WMP_GIF_NO_IMAGE_IN_FILE _HRESULT_TYPEDEF_(0xc00d1027) +#define NS_E_WMP_PNG_INVALIDFORMAT _HRESULT_TYPEDEF_(0xc00d1028) +#define NS_E_WMP_PNG_UNSUPPORTED_BITDEPTH _HRESULT_TYPEDEF_(0xc00d1029) +#define NS_E_WMP_PNG_UNSUPPORTED_COMPRESSION _HRESULT_TYPEDEF_(0xc00d102a) +#define NS_E_WMP_PNG_UNSUPPORTED_FILTER _HRESULT_TYPEDEF_(0xc00d102b) +#define NS_E_WMP_PNG_UNSUPPORTED_INTERLACE _HRESULT_TYPEDEF_(0xc00d102c) +#define NS_E_WMP_PNG_UNSUPPORTED_BAD_CRC _HRESULT_TYPEDEF_(0xc00d102d) +#define NS_E_WMP_BMP_INVALID_BITMASK _HRESULT_TYPEDEF_(0xc00d102e) +#define NS_E_WMP_BMP_TOPDOWN_DIB_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d102f) +#define NS_E_WMP_BMP_BITMAP_NOT_CREATED _HRESULT_TYPEDEF_(0xc00d1030) +#define NS_E_WMP_BMP_COMPRESSION_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d1031) +#define NS_E_WMP_BMP_INVALID_FORMAT _HRESULT_TYPEDEF_(0xc00d1032) +#define NS_E_WMP_JPG_JERR_ARITHCODING_NOTIMPL _HRESULT_TYPEDEF_(0xc00d1033) +#define NS_E_WMP_JPG_INVALID_FORMAT _HRESULT_TYPEDEF_(0xc00d1034) +#define NS_E_WMP_JPG_BAD_DCTSIZE _HRESULT_TYPEDEF_(0xc00d1035) +#define NS_E_WMP_JPG_BAD_VERSION_NUMBER _HRESULT_TYPEDEF_(0xc00d1036) +#define NS_E_WMP_JPG_BAD_PRECISION _HRESULT_TYPEDEF_(0xc00d1037) +#define NS_E_WMP_JPG_CCIR601_NOTIMPL _HRESULT_TYPEDEF_(0xc00d1038) +#define NS_E_WMP_JPG_NO_IMAGE_IN_FILE _HRESULT_TYPEDEF_(0xc00d1039) +#define NS_E_WMP_JPG_READ_ERROR _HRESULT_TYPEDEF_(0xc00d103a) +#define NS_E_WMP_JPG_FRACT_SAMPLE_NOTIMPL _HRESULT_TYPEDEF_(0xc00d103b) +#define NS_E_WMP_JPG_IMAGE_TOO_BIG _HRESULT_TYPEDEF_(0xc00d103c) +#define NS_E_WMP_JPG_UNEXPECTED_ENDOFFILE _HRESULT_TYPEDEF_(0xc00d103d) +#define NS_E_WMP_JPG_SOF_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d103e) +#define NS_E_WMP_JPG_UNKNOWN_MARKER _HRESULT_TYPEDEF_(0xc00d103f) +#define NS_S_WMP_LOADED_GIF_IMAGE _HRESULT_TYPEDEF_(0x000d1040) +#define NS_S_WMP_LOADED_PNG_IMAGE _HRESULT_TYPEDEF_(0x000d1041) +#define NS_S_WMP_LOADED_BMP_IMAGE _HRESULT_TYPEDEF_(0x000d1042) +#define NS_S_WMP_LOADED_JPG_IMAGE _HRESULT_TYPEDEF_(0x000d1043) +#define NS_E_WMP_FAILED_TO_OPEN_IMAGE _HRESULT_TYPEDEF_(0xc00d1044) +#define NS_E_WMP_DAI_SONGTOOSHORT _HRESULT_TYPEDEF_(0xc00d1049) +#define NS_E_WMG_RATEUNAVAILABLE _HRESULT_TYPEDEF_(0xc00d104a) +#define NS_E_WMG_PLUGINUNAVAILABLE _HRESULT_TYPEDEF_(0xc00d104b) +#define NS_E_WMG_CANNOTQUEUE _HRESULT_TYPEDEF_(0xc00d104c) +#define NS_E_WMG_PREROLLLICENSEACQUISITIONNOTALLOWED _HRESULT_TYPEDEF_(0xc00d104d) +#define NS_E_WMG_UNEXPECTEDPREROLLSTATUS _HRESULT_TYPEDEF_(0xc00d104e) +#define NS_S_WMG_FORCE_DROP_FRAME _HRESULT_TYPEDEF_(0x000d104f) +#define NS_E_WMG_INVALID_COPP_CERTIFICATE _HRESULT_TYPEDEF_(0xc00d1051) +#define NS_E_WMG_COPP_SECURITY_INVALID _HRESULT_TYPEDEF_(0xc00d1052) +#define NS_E_WMG_COPP_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d1053) +#define NS_E_WMG_INVALIDSTATE _HRESULT_TYPEDEF_(0xc00d1054) +#define NS_E_WMG_SINKALREADYEXISTS _HRESULT_TYPEDEF_(0xc00d1055) +#define NS_E_WMG_NOSDKINTERFACE _HRESULT_TYPEDEF_(0xc00d1056) +#define NS_E_WMG_NOTALLOUTPUTSRENDERED _HRESULT_TYPEDEF_(0xc00d1057) +#define NS_E_WMG_FILETRANSFERNOTALLOWED _HRESULT_TYPEDEF_(0xc00d1058) +#define NS_E_WMR_UNSUPPORTEDSTREAM _HRESULT_TYPEDEF_(0xc00d1059) +#define NS_E_WMR_PINNOTFOUND _HRESULT_TYPEDEF_(0xc00d105a) +#define NS_E_WMR_WAITINGONFORMATSWITCH _HRESULT_TYPEDEF_(0xc00d105b) +#define NS_E_WMR_NOSOURCEFILTER _HRESULT_TYPEDEF_(0xc00d105c) +#define NS_E_WMR_PINTYPENOMATCH _HRESULT_TYPEDEF_(0xc00d105d) +#define NS_E_WMR_NOCALLBACKAVAILABLE _HRESULT_TYPEDEF_(0xc00d105e) +#define NS_S_WMR_ALREADYRENDERED _HRESULT_TYPEDEF_(0x000d105f) +#define NS_S_WMR_PINTYPEPARTIALMATCH _HRESULT_TYPEDEF_(0x000d1060) +#define NS_S_WMR_PINTYPEFULLMATCH _HRESULT_TYPEDEF_(0x000d1061) +#define NS_E_WMR_SAMPLEPROPERTYNOTSET _HRESULT_TYPEDEF_(0xc00d1062) +#define NS_E_WMR_CANNOT_RENDER_BINARY_STREAM _HRESULT_TYPEDEF_(0xc00d1063) +#define NS_E_WMG_LICENSE_TAMPERED _HRESULT_TYPEDEF_(0xc00d1064) +#define NS_E_WMR_WILLNOT_RENDER_BINARY_STREAM _HRESULT_TYPEDEF_(0xc00d1065) +#define NS_S_WMG_ADVISE_DROP_FRAME _HRESULT_TYPEDEF_(0x000d1066) +#define NS_S_WMG_ADVISE_DROP_TO_KEYFRAME _HRESULT_TYPEDEF_(0x000d1067) +#define NS_E_WMX_UNRECOGNIZED_PLAYLIST_FORMAT _HRESULT_TYPEDEF_(0xc00d1068) +#define NS_E_ASX_INVALIDFORMAT _HRESULT_TYPEDEF_(0xc00d1069) +#define NS_E_ASX_INVALIDVERSION _HRESULT_TYPEDEF_(0xc00d106a) +#define NS_E_ASX_INVALID_REPEAT_BLOCK _HRESULT_TYPEDEF_(0xc00d106b) +#define NS_E_ASX_NOTHING_TO_WRITE _HRESULT_TYPEDEF_(0xc00d106c) +#define NS_E_URLLIST_INVALIDFORMAT _HRESULT_TYPEDEF_(0xc00d106d) +#define NS_E_WMX_ATTRIBUTE_DOES_NOT_EXIST _HRESULT_TYPEDEF_(0xc00d106e) +#define NS_E_WMX_ATTRIBUTE_ALREADY_EXISTS _HRESULT_TYPEDEF_(0xc00d106f) +#define NS_E_WMX_ATTRIBUTE_UNRETRIEVABLE _HRESULT_TYPEDEF_(0xc00d1070) +#define NS_E_WMX_ITEM_DOES_NOT_EXIST _HRESULT_TYPEDEF_(0xc00d1071) +#define NS_E_WMX_ITEM_TYPE_ILLEGAL _HRESULT_TYPEDEF_(0xc00d1072) +#define NS_E_WMX_ITEM_UNSETTABLE _HRESULT_TYPEDEF_(0xc00d1073) +#define NS_E_WMX_PLAYLIST_EMPTY _HRESULT_TYPEDEF_(0xc00d1074) +#define NS_E_MLS_SMARTPLAYLIST_FILTER_NOT_REGISTERED _HRESULT_TYPEDEF_(0xc00d1075) +#define NS_E_WMX_INVALID_FORMAT_OVER_NESTING _HRESULT_TYPEDEF_(0xc00d1076) +#define NS_E_WMPCORE_NOSOURCEURLSTRING _HRESULT_TYPEDEF_(0xc00d107c) +#define NS_E_WMPCORE_COCREATEFAILEDFORGITOBJECT _HRESULT_TYPEDEF_(0xc00d107d) +#define NS_E_WMPCORE_FAILEDTOGETMARSHALLEDEVENTHANDLERINTERFACE _HRESULT_TYPEDEF_(0xc00d107e) +#define NS_E_WMPCORE_BUFFERTOOSMALL _HRESULT_TYPEDEF_(0xc00d107f) +#define NS_E_WMPCORE_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d1080) +#define NS_E_WMPCORE_INVALIDPLAYLISTMODE _HRESULT_TYPEDEF_(0xc00d1081) +#define NS_E_WMPCORE_ITEMNOTINPLAYLIST _HRESULT_TYPEDEF_(0xc00d1086) +#define NS_E_WMPCORE_PLAYLISTEMPTY _HRESULT_TYPEDEF_(0xc00d1087) +#define NS_E_WMPCORE_NOBROWSER _HRESULT_TYPEDEF_(0xc00d1088) +#define NS_E_WMPCORE_UNRECOGNIZED_MEDIA_URL _HRESULT_TYPEDEF_(0xc00d1089) +#define NS_E_WMPCORE_GRAPH_NOT_IN_LIST _HRESULT_TYPEDEF_(0xc00d108a) +#define NS_E_WMPCORE_PLAYLIST_EMPTY_OR_SINGLE_MEDIA _HRESULT_TYPEDEF_(0xc00d108b) +#define NS_E_WMPCORE_ERRORSINKNOTREGISTERED _HRESULT_TYPEDEF_(0xc00d108c) +#define NS_E_WMPCORE_ERRORMANAGERNOTAVAILABLE _HRESULT_TYPEDEF_(0xc00d108d) +#define NS_E_WMPCORE_WEBHELPFAILED _HRESULT_TYPEDEF_(0xc00d108e) +#define NS_E_WMPCORE_MEDIA_ERROR_RESUME_FAILED _HRESULT_TYPEDEF_(0xc00d108f) +#define NS_E_WMPCORE_NO_REF_IN_ENTRY _HRESULT_TYPEDEF_(0xc00d1090) +#define NS_E_WMPCORE_WMX_LIST_ATTRIBUTE_NAME_EMPTY _HRESULT_TYPEDEF_(0xc00d1091) +#define NS_E_WMPCORE_WMX_LIST_ATTRIBUTE_NAME_ILLEGAL _HRESULT_TYPEDEF_(0xc00d1092) +#define NS_E_WMPCORE_WMX_LIST_ATTRIBUTE_VALUE_EMPTY _HRESULT_TYPEDEF_(0xc00d1093) +#define NS_E_WMPCORE_WMX_LIST_ATTRIBUTE_VALUE_ILLEGAL _HRESULT_TYPEDEF_(0xc00d1094) +#define NS_E_WMPCORE_WMX_LIST_ITEM_ATTRIBUTE_NAME_EMPTY _HRESULT_TYPEDEF_(0xc00d1095) +#define NS_E_WMPCORE_WMX_LIST_ITEM_ATTRIBUTE_NAME_ILLEGAL _HRESULT_TYPEDEF_(0xc00d1096) +#define NS_E_WMPCORE_WMX_LIST_ITEM_ATTRIBUTE_VALUE_EMPTY _HRESULT_TYPEDEF_(0xc00d1097) +#define NS_E_WMPCORE_LIST_ENTRY_NO_REF _HRESULT_TYPEDEF_(0xc00d1098) +#define NS_E_WMPCORE_MISNAMED_FILE _HRESULT_TYPEDEF_(0xc00d1099) +#define NS_E_WMPCORE_CODEC_NOT_TRUSTED _HRESULT_TYPEDEF_(0xc00d109a) +#define NS_E_WMPCORE_CODEC_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d109b) +#define NS_E_WMPCORE_CODEC_DOWNLOAD_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d109c) +#define NS_E_WMPCORE_ERROR_DOWNLOADING_PLAYLIST _HRESULT_TYPEDEF_(0xc00d109d) +#define NS_E_WMPCORE_FAILED_TO_BUILD_PLAYLIST _HRESULT_TYPEDEF_(0xc00d109e) +#define NS_E_WMPCORE_PLAYLIST_ITEM_ALTERNATE_NONE _HRESULT_TYPEDEF_(0xc00d109f) +#define NS_E_WMPCORE_PLAYLIST_ITEM_ALTERNATE_EXHAUSTED _HRESULT_TYPEDEF_(0xc00d10a0) +#define NS_E_WMPCORE_PLAYLIST_ITEM_ALTERNATE_NAME_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d10a1) +#define NS_E_WMPCORE_PLAYLIST_ITEM_ALTERNATE_MORPH_FAILED _HRESULT_TYPEDEF_(0xc00d10a2) +#define NS_E_WMPCORE_PLAYLIST_ITEM_ALTERNATE_INIT_FAILED _HRESULT_TYPEDEF_(0xc00d10a3) +#define NS_E_WMPCORE_MEDIA_ALTERNATE_REF_EMPTY _HRESULT_TYPEDEF_(0xc00d10a4) +#define NS_E_WMPCORE_PLAYLIST_NO_EVENT_NAME _HRESULT_TYPEDEF_(0xc00d10a5) +#define NS_E_WMPCORE_PLAYLIST_EVENT_ATTRIBUTE_ABSENT _HRESULT_TYPEDEF_(0xc00d10a6) +#define NS_E_WMPCORE_PLAYLIST_EVENT_EMPTY _HRESULT_TYPEDEF_(0xc00d10a7) +#define NS_E_WMPCORE_PLAYLIST_STACK_EMPTY _HRESULT_TYPEDEF_(0xc00d10a8) +#define NS_E_WMPCORE_CURRENT_MEDIA_NOT_ACTIVE _HRESULT_TYPEDEF_(0xc00d10a9) +#define NS_E_WMPCORE_USER_CANCEL _HRESULT_TYPEDEF_(0xc00d10ab) +#define NS_E_WMPCORE_PLAYLIST_REPEAT_EMPTY _HRESULT_TYPEDEF_(0xc00d10ac) +#define NS_E_WMPCORE_PLAYLIST_REPEAT_START_MEDIA_NONE _HRESULT_TYPEDEF_(0xc00d10ad) +#define NS_E_WMPCORE_PLAYLIST_REPEAT_END_MEDIA_NONE _HRESULT_TYPEDEF_(0xc00d10ae) +#define NS_E_WMPCORE_INVALID_PLAYLIST_URL _HRESULT_TYPEDEF_(0xc00d10af) +#define NS_E_WMPCORE_MISMATCHED_RUNTIME _HRESULT_TYPEDEF_(0xc00d10b0) +#define NS_E_WMPCORE_PLAYLIST_IMPORT_FAILED_NO_ITEMS _HRESULT_TYPEDEF_(0xc00d10b1) +#define NS_E_WMPCORE_VIDEO_TRANSFORM_FILTER_INSERTION _HRESULT_TYPEDEF_(0xc00d10b2) +#define NS_E_WMPCORE_MEDIA_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d10b3) +#define NS_E_WMPCORE_WMX_ENTRYREF_NO_REF _HRESULT_TYPEDEF_(0xc00d10b4) +#define NS_E_WMPCORE_NO_PLAYABLE_MEDIA_IN_PLAYLIST _HRESULT_TYPEDEF_(0xc00d10b5) +#define NS_E_WMPCORE_PLAYLIST_EMPTY_NESTED_PLAYLIST_SKIPPED_ITEMS _HRESULT_TYPEDEF_(0xc00d10b6) +#define NS_E_WMPCORE_BUSY _HRESULT_TYPEDEF_(0xc00d10b7) +#define NS_E_WMPCORE_MEDIA_CHILD_PLAYLIST_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d10b8) +#define NS_E_WMPCORE_MEDIA_NO_CHILD_PLAYLIST _HRESULT_TYPEDEF_(0xc00d10b9) +#define NS_E_WMPCORE_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d10ba) +#define NS_E_WMPCORE_TEMP_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d10bb) +#define NS_E_WMDM_REVOKED _HRESULT_TYPEDEF_(0xc00d10bc) +#define NS_E_DDRAW_GENERIC _HRESULT_TYPEDEF_(0xc00d10bd) +#define NS_E_DISPLAY_MODE_CHANGE_FAILED _HRESULT_TYPEDEF_(0xc00d10be) +#define NS_E_PLAYLIST_CONTAINS_ERRORS _HRESULT_TYPEDEF_(0xc00d10bf) +#define NS_E_CHANGING_PROXY_NAME _HRESULT_TYPEDEF_(0xc00d10c0) +#define NS_E_CHANGING_PROXY_PORT _HRESULT_TYPEDEF_(0xc00d10c1) +#define NS_E_CHANGING_PROXY_EXCEPTIONLIST _HRESULT_TYPEDEF_(0xc00d10c2) +#define NS_E_CHANGING_PROXYBYPASS _HRESULT_TYPEDEF_(0xc00d10c3) +#define NS_E_CHANGING_PROXY_PROTOCOL_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d10c4) +#define NS_E_GRAPH_NOAUDIOLANGUAGE _HRESULT_TYPEDEF_(0xc00d10c5) +#define NS_E_GRAPH_NOAUDIOLANGUAGESELECTED _HRESULT_TYPEDEF_(0xc00d10c6) +#define NS_E_CORECD_NOTAMEDIACD _HRESULT_TYPEDEF_(0xc00d10c7) +#define NS_E_WMPCORE_MEDIA_URL_TOO_LONG _HRESULT_TYPEDEF_(0xc00d10c8) +#define NS_E_WMPFLASH_CANT_FIND_COM_SERVER _HRESULT_TYPEDEF_(0xc00d10c9) +#define NS_E_WMPFLASH_INCOMPATIBLEVERSION _HRESULT_TYPEDEF_(0xc00d10ca) +#define NS_E_WMPOCXGRAPH_IE_DISALLOWS_ACTIVEX_CONTROLS _HRESULT_TYPEDEF_(0xc00d10cb) +#define NS_E_NEED_CORE_REFERENCE _HRESULT_TYPEDEF_(0xc00d10cc) +#define NS_E_MEDIACD_READ_ERROR _HRESULT_TYPEDEF_(0xc00d10cd) +#define NS_E_IE_DISALLOWS_ACTIVEX_CONTROLS _HRESULT_TYPEDEF_(0xc00d10ce) +#define NS_E_FLASH_PLAYBACK_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d10cf) +#define NS_E_UNABLE_TO_CREATE_RIP_LOCATION _HRESULT_TYPEDEF_(0xc00d10d0) +#define NS_E_WMPCORE_SOME_CODECS_MISSING _HRESULT_TYPEDEF_(0xc00d10d1) +#define NS_E_WMP_RIP_FAILED _HRESULT_TYPEDEF_(0xc00d10d2) +#define NS_E_WMP_FAILED_TO_RIP_TRACK _HRESULT_TYPEDEF_(0xc00d10d3) +#define NS_E_WMP_ERASE_FAILED _HRESULT_TYPEDEF_(0xc00d10d4) +#define NS_E_WMP_FORMAT_FAILED _HRESULT_TYPEDEF_(0xc00d10d5) +#define NS_E_WMP_CANNOT_BURN_NON_LOCAL_FILE _HRESULT_TYPEDEF_(0xc00d10d6) +#define NS_E_WMP_FILE_TYPE_CANNOT_BURN_TO_AUDIO_CD _HRESULT_TYPEDEF_(0xc00d10d7) +#define NS_E_WMP_FILE_DOES_NOT_FIT_ON_CD _HRESULT_TYPEDEF_(0xc00d10d8) +#define NS_E_WMP_FILE_NO_DURATION _HRESULT_TYPEDEF_(0xc00d10d9) +#define NS_E_PDA_FAILED_TO_BURN _HRESULT_TYPEDEF_(0xc00d10da) +#define NS_S_NEED_TO_BUY_BURN_RIGHTS _HRESULT_TYPEDEF_(0x000d10db) +#define NS_E_FAILED_DOWNLOAD_ABORT_BURN _HRESULT_TYPEDEF_(0xc00d10dc) +#define NS_E_WMPCORE_DEVICE_DRIVERS_MISSING _HRESULT_TYPEDEF_(0xc00d10dd) +#define NS_S_WMPCORE_PLAYLISTCLEARABORT _HRESULT_TYPEDEF_(0x000d10fe) +#define NS_S_WMPCORE_PLAYLISTREMOVEITEMABORT _HRESULT_TYPEDEF_(0x000d10ff) +#define NS_S_WMPCORE_PLAYLIST_CREATION_PENDING _HRESULT_TYPEDEF_(0x000d1102) +#define NS_S_WMPCORE_MEDIA_VALIDATION_PENDING _HRESULT_TYPEDEF_(0x000d1103) +#define NS_S_WMPCORE_PLAYLIST_REPEAT_SECONDARY_SEGMENTS_IGNORED _HRESULT_TYPEDEF_(0x000d1104) +#define NS_S_WMPCORE_COMMAND_NOT_AVAILABLE _HRESULT_TYPEDEF_(0x000d1105) +#define NS_S_WMPCORE_PLAYLIST_NAME_AUTO_GENERATED _HRESULT_TYPEDEF_(0x000d1106) +#define NS_S_WMPCORE_PLAYLIST_IMPORT_MISSING_ITEMS _HRESULT_TYPEDEF_(0x000d1107) +#define NS_S_WMPCORE_PLAYLIST_COLLAPSED_TO_SINGLE_MEDIA _HRESULT_TYPEDEF_(0x000d1108) +#define NS_S_WMPCORE_MEDIA_CHILD_PLAYLIST_OPEN_PENDING _HRESULT_TYPEDEF_(0x000d1109) +#define NS_S_WMPCORE_MORE_NODES_AVAIABLE _HRESULT_TYPEDEF_(0x000d110a) +#define NS_E_WMPIM_USEROFFLINE _HRESULT_TYPEDEF_(0xc00d1126) +#define NS_E_WMPIM_USERCANCELED _HRESULT_TYPEDEF_(0xc00d1127) +#define NS_E_WMPIM_DIALUPFAILED _HRESULT_TYPEDEF_(0xc00d1128) +#define NS_E_WINSOCK_ERROR_STRING _HRESULT_TYPEDEF_(0xc00d1129) +#define NS_E_WMPBR_NOLISTENER _HRESULT_TYPEDEF_(0xc00d1130) +#define NS_E_WMPBR_BACKUPCANCEL _HRESULT_TYPEDEF_(0xc00d1131) +#define NS_E_WMPBR_RESTORECANCEL _HRESULT_TYPEDEF_(0xc00d1132) +#define NS_E_WMPBR_ERRORWITHURL _HRESULT_TYPEDEF_(0xc00d1133) +#define NS_E_WMPBR_NAMECOLLISION _HRESULT_TYPEDEF_(0xc00d1134) +#define NS_S_WMPBR_SUCCESS _HRESULT_TYPEDEF_(0x000d1135) +#define NS_S_WMPBR_PARTIALSUCCESS _HRESULT_TYPEDEF_(0x000d1136) +#define NS_E_WMPBR_DRIVE_INVALID _HRESULT_TYPEDEF_(0xc00d1137) +#define NS_E_WMPBR_BACKUPRESTOREFAILED _HRESULT_TYPEDEF_(0xc00d1138) +#define NS_S_WMPEFFECT_TRANSPARENT _HRESULT_TYPEDEF_(0x000d1144) +#define NS_S_WMPEFFECT_OPAQUE _HRESULT_TYPEDEF_(0x000d1145) +#define NS_S_OPERATION_PENDING _HRESULT_TYPEDEF_(0x000d114e) +#define NS_E_WMP_CONVERT_FILE_FAILED _HRESULT_TYPEDEF_(0xc00d1158) +#define NS_E_WMP_CONVERT_NO_RIGHTS_ERRORURL _HRESULT_TYPEDEF_(0xc00d1159) +#define NS_E_WMP_CONVERT_NO_RIGHTS_NOERRORURL _HRESULT_TYPEDEF_(0xc00d115a) +#define NS_E_WMP_CONVERT_FILE_CORRUPT _HRESULT_TYPEDEF_(0xc00d115b) +#define NS_E_WMP_CONVERT_PLUGIN_UNAVAILABLE_ERRORURL _HRESULT_TYPEDEF_(0xc00d115c) +#define NS_E_WMP_CONVERT_PLUGIN_UNAVAILABLE_NOERRORURL _HRESULT_TYPEDEF_(0xc00d115d) +#define NS_E_WMP_CONVERT_PLUGIN_UNKNOWN_FILE_OWNER _HRESULT_TYPEDEF_(0xc00d115e) +#define NS_E_DVD_DISC_COPY_PROTECT_OUTPUT_NS _HRESULT_TYPEDEF_(0xc00d1160) +#define NS_E_DVD_DISC_COPY_PROTECT_OUTPUT_FAILED _HRESULT_TYPEDEF_(0xc00d1161) +#define NS_E_DVD_NO_SUBPICTURE_STREAM _HRESULT_TYPEDEF_(0xc00d1162) +#define NS_E_DVD_COPY_PROTECT _HRESULT_TYPEDEF_(0xc00d1163) +#define NS_E_DVD_AUTHORING_PROBLEM _HRESULT_TYPEDEF_(0xc00d1164) +#define NS_E_DVD_INVALID_DISC_REGION _HRESULT_TYPEDEF_(0xc00d1165) +#define NS_E_DVD_COMPATIBLE_VIDEO_CARD _HRESULT_TYPEDEF_(0xc00d1166) +#define NS_E_DVD_MACROVISION _HRESULT_TYPEDEF_(0xc00d1167) +#define NS_E_DVD_SYSTEM_DECODER_REGION _HRESULT_TYPEDEF_(0xc00d1168) +#define NS_E_DVD_DISC_DECODER_REGION _HRESULT_TYPEDEF_(0xc00d1169) +#define NS_E_DVD_NO_VIDEO_STREAM _HRESULT_TYPEDEF_(0xc00d116a) +#define NS_E_DVD_NO_AUDIO_STREAM _HRESULT_TYPEDEF_(0xc00d116b) +#define NS_E_DVD_GRAPH_BUILDING _HRESULT_TYPEDEF_(0xc00d116c) +#define NS_E_DVD_NO_DECODER _HRESULT_TYPEDEF_(0xc00d116d) +#define NS_E_DVD_PARENTAL _HRESULT_TYPEDEF_(0xc00d116e) +#define NS_E_DVD_CANNOT_JUMP _HRESULT_TYPEDEF_(0xc00d116f) +#define NS_E_DVD_DEVICE_CONTENTION _HRESULT_TYPEDEF_(0xc00d1170) +#define NS_E_DVD_NO_VIDEO_MEMORY _HRESULT_TYPEDEF_(0xc00d1171) +#define NS_E_DVD_CANNOT_COPY_PROTECTED _HRESULT_TYPEDEF_(0xc00d1172) +#define NS_E_DVD_REQUIRED_PROPERTY_NOT_SET _HRESULT_TYPEDEF_(0xc00d1173) +#define NS_E_DVD_INVALID_TITLE_CHAPTER _HRESULT_TYPEDEF_(0xc00d1174) +#define NS_E_NO_CD_BURNER _HRESULT_TYPEDEF_(0xc00d1176) +#define NS_E_DEVICE_IS_NOT_READY _HRESULT_TYPEDEF_(0xc00d1177) +#define NS_E_PDA_UNSUPPORTED_FORMAT _HRESULT_TYPEDEF_(0xc00d1178) +#define NS_E_NO_PDA _HRESULT_TYPEDEF_(0xc00d1179) +#define NS_E_PDA_UNSPECIFIED_ERROR _HRESULT_TYPEDEF_(0xc00d117a) +#define NS_E_MEMSTORAGE_BAD_DATA _HRESULT_TYPEDEF_(0xc00d117b) +#define NS_E_PDA_FAIL_SELECT_DEVICE _HRESULT_TYPEDEF_(0xc00d117c) +#define NS_E_PDA_FAIL_READ_WAVE_FILE _HRESULT_TYPEDEF_(0xc00d117d) +#define NS_E_IMAPI_LOSSOFSTREAMING _HRESULT_TYPEDEF_(0xc00d117e) +#define NS_E_PDA_DEVICE_FULL _HRESULT_TYPEDEF_(0xc00d117f) +#define NS_E_FAIL_LAUNCH_ROXIO_PLUGIN _HRESULT_TYPEDEF_(0xc00d1180) +#define NS_E_PDA_DEVICE_FULL_IN_SESSION _HRESULT_TYPEDEF_(0xc00d1181) +#define NS_E_IMAPI_MEDIUM_INVALIDTYPE _HRESULT_TYPEDEF_(0xc00d1182) +#define NS_E_PDA_MANUALDEVICE _HRESULT_TYPEDEF_(0xc00d1183) +#define NS_E_PDA_PARTNERSHIPNOTEXIST _HRESULT_TYPEDEF_(0xc00d1184) +#define NS_E_PDA_CANNOT_CREATE_ADDITIONAL_SYNC_RELATIONSHIP _HRESULT_TYPEDEF_(0xc00d1185) +#define NS_E_PDA_NO_TRANSCODE_OF_DRM _HRESULT_TYPEDEF_(0xc00d1186) +#define NS_E_PDA_TRANSCODECACHEFULL _HRESULT_TYPEDEF_(0xc00d1187) +#define NS_E_PDA_TOO_MANY_FILE_COLLISIONS _HRESULT_TYPEDEF_(0xc00d1188) +#define NS_E_PDA_CANNOT_TRANSCODE _HRESULT_TYPEDEF_(0xc00d1189) +#define NS_E_PDA_TOO_MANY_FILES_IN_DIRECTORY _HRESULT_TYPEDEF_(0xc00d118a) +#define NS_E_PROCESSINGSHOWSYNCWIZARD _HRESULT_TYPEDEF_(0xc00d118b) +#define NS_E_PDA_TRANSCODE_NOT_PERMITTED _HRESULT_TYPEDEF_(0xc00d118c) +#define NS_E_PDA_INITIALIZINGDEVICES _HRESULT_TYPEDEF_(0xc00d118d) +#define NS_E_PDA_OBSOLETE_SP _HRESULT_TYPEDEF_(0xc00d118e) +#define NS_E_PDA_TITLE_COLLISION _HRESULT_TYPEDEF_(0xc00d118f) +#define NS_E_PDA_DEVICESUPPORTDISABLED _HRESULT_TYPEDEF_(0xc00d1190) +#define NS_E_PDA_NO_LONGER_AVAILABLE _HRESULT_TYPEDEF_(0xc00d1191) +#define NS_E_PDA_ENCODER_NOT_RESPONDING _HRESULT_TYPEDEF_(0xc00d1192) +#define NS_E_PDA_CANNOT_SYNC_FROM_LOCATION _HRESULT_TYPEDEF_(0xc00d1193) +#define NS_E_WMP_PROTOCOL_PROBLEM _HRESULT_TYPEDEF_(0xc00d1194) +#define NS_E_WMP_NO_DISK_SPACE _HRESULT_TYPEDEF_(0xc00d1195) +#define NS_E_WMP_LOGON_FAILURE _HRESULT_TYPEDEF_(0xc00d1196) +#define NS_E_WMP_CANNOT_FIND_FILE _HRESULT_TYPEDEF_(0xc00d1197) +#define NS_E_WMP_SERVER_INACCESSIBLE _HRESULT_TYPEDEF_(0xc00d1198) +#define NS_E_WMP_UNSUPPORTED_FORMAT _HRESULT_TYPEDEF_(0xc00d1199) +#define NS_E_WMP_DSHOW_UNSUPPORTED_FORMAT _HRESULT_TYPEDEF_(0xc00d119a) +#define NS_E_WMP_PLAYLIST_EXISTS _HRESULT_TYPEDEF_(0xc00d119b) +#define NS_E_WMP_NONMEDIA_FILES _HRESULT_TYPEDEF_(0xc00d119c) +#define NS_E_WMP_INVALID_ASX _HRESULT_TYPEDEF_(0xc00d119d) +#define NS_E_WMP_ALREADY_IN_USE _HRESULT_TYPEDEF_(0xc00d119e) +#define NS_E_WMP_IMAPI_FAILURE _HRESULT_TYPEDEF_(0xc00d119f) +#define NS_E_WMP_WMDM_FAILURE _HRESULT_TYPEDEF_(0xc00d11a0) +#define NS_E_WMP_CODEC_NEEDED_WITH_4CC _HRESULT_TYPEDEF_(0xc00d11a1) +#define NS_E_WMP_CODEC_NEEDED_WITH_FORMATTAG _HRESULT_TYPEDEF_(0xc00d11a2) +#define NS_E_WMP_MSSAP_NOT_AVAILABLE _HRESULT_TYPEDEF_(0xc00d11a3) +#define NS_E_WMP_WMDM_INTERFACEDEAD _HRESULT_TYPEDEF_(0xc00d11a4) +#define NS_E_WMP_WMDM_NOTCERTIFIED _HRESULT_TYPEDEF_(0xc00d11a5) +#define NS_E_WMP_WMDM_LICENSE_NOTEXIST _HRESULT_TYPEDEF_(0xc00d11a6) +#define NS_E_WMP_WMDM_LICENSE_EXPIRED _HRESULT_TYPEDEF_(0xc00d11a7) +#define NS_E_WMP_WMDM_BUSY _HRESULT_TYPEDEF_(0xc00d11a8) +#define NS_E_WMP_WMDM_NORIGHTS _HRESULT_TYPEDEF_(0xc00d11a9) +#define NS_E_WMP_WMDM_INCORRECT_RIGHTS _HRESULT_TYPEDEF_(0xc00d11aa) +#define NS_E_WMP_IMAPI_GENERIC _HRESULT_TYPEDEF_(0xc00d11ab) +#define NS_E_WMP_IMAPI_DEVICE_NOTPRESENT _HRESULT_TYPEDEF_(0xc00d11ad) +#define NS_E_WMP_IMAPI_DEVICE_BUSY _HRESULT_TYPEDEF_(0xc00d11ae) +#define NS_E_WMP_IMAPI_LOSS_OF_STREAMING _HRESULT_TYPEDEF_(0xc00d11af) +#define NS_E_WMP_SERVER_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d11b0) +#define NS_E_WMP_FILE_OPEN_FAILED _HRESULT_TYPEDEF_(0xc00d11b1) +#define NS_E_WMP_VERIFY_ONLINE _HRESULT_TYPEDEF_(0xc00d11b2) +#define NS_E_WMP_SERVER_NOT_RESPONDING _HRESULT_TYPEDEF_(0xc00d11b3) +#define NS_E_WMP_DRM_CORRUPT_BACKUP _HRESULT_TYPEDEF_(0xc00d11b4) +#define NS_E_WMP_DRM_LICENSE_SERVER_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d11b5) +#define NS_E_WMP_NETWORK_FIREWALL _HRESULT_TYPEDEF_(0xc00d11b6) +#define NS_E_WMP_NO_REMOVABLE_MEDIA _HRESULT_TYPEDEF_(0xc00d11b7) +#define NS_E_WMP_PROXY_CONNECT_TIMEOUT _HRESULT_TYPEDEF_(0xc00d11b8) +#define NS_E_WMP_NEED_UPGRADE _HRESULT_TYPEDEF_(0xc00d11b9) +#define NS_E_WMP_AUDIO_HW_PROBLEM _HRESULT_TYPEDEF_(0xc00d11ba) +#define NS_E_WMP_INVALID_PROTOCOL _HRESULT_TYPEDEF_(0xc00d11bb) +#define NS_E_WMP_INVALID_LIBRARY_ADD _HRESULT_TYPEDEF_(0xc00d11bc) +#define NS_E_WMP_MMS_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00d11bd) +#define NS_E_WMP_NO_PROTOCOLS_SELECTED _HRESULT_TYPEDEF_(0xc00d11be) +#define NS_E_WMP_GOFULLSCREEN_FAILED _HRESULT_TYPEDEF_(0xc00d11bf) +#define NS_E_WMP_NETWORK_ERROR _HRESULT_TYPEDEF_(0xc00d11c0) +#define NS_E_WMP_CONNECT_TIMEOUT _HRESULT_TYPEDEF_(0xc00d11c1) +#define NS_E_WMP_MULTICAST_DISABLED _HRESULT_TYPEDEF_(0xc00d11c2) +#define NS_E_WMP_SERVER_DNS_TIMEOUT _HRESULT_TYPEDEF_(0xc00d11c3) +#define NS_E_WMP_PROXY_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d11c4) +#define NS_E_WMP_TAMPERED_CONTENT _HRESULT_TYPEDEF_(0xc00d11c5) +#define NS_E_WMP_OUTOFMEMORY _HRESULT_TYPEDEF_(0xc00d11c6) +#define NS_E_WMP_AUDIO_CODEC_NOT_INSTALLED _HRESULT_TYPEDEF_(0xc00d11c7) +#define NS_E_WMP_VIDEO_CODEC_NOT_INSTALLED _HRESULT_TYPEDEF_(0xc00d11c8) +#define NS_E_WMP_IMAPI_DEVICE_INVALIDTYPE _HRESULT_TYPEDEF_(0xc00d11c9) +#define NS_E_WMP_DRM_DRIVER_AUTH_FAILURE _HRESULT_TYPEDEF_(0xc00d11ca) +#define NS_E_WMP_NETWORK_RESOURCE_FAILURE _HRESULT_TYPEDEF_(0xc00d11cb) +#define NS_E_WMP_UPGRADE_APPLICATION _HRESULT_TYPEDEF_(0xc00d11cc) +#define NS_E_WMP_UNKNOWN_ERROR _HRESULT_TYPEDEF_(0xc00d11cd) +#define NS_E_WMP_INVALID_KEY _HRESULT_TYPEDEF_(0xc00d11ce) +#define NS_E_WMP_CD_ANOTHER_USER _HRESULT_TYPEDEF_(0xc00d11cf) +#define NS_E_WMP_DRM_NEEDS_AUTHORIZATION _HRESULT_TYPEDEF_(0xc00d11d0) +#define NS_E_WMP_BAD_DRIVER _HRESULT_TYPEDEF_(0xc00d11d1) +#define NS_E_WMP_ACCESS_DENIED _HRESULT_TYPEDEF_(0xc00d11d2) +#define NS_E_WMP_LICENSE_RESTRICTS _HRESULT_TYPEDEF_(0xc00d11d3) +#define NS_E_WMP_INVALID_REQUEST _HRESULT_TYPEDEF_(0xc00d11d4) +#define NS_E_WMP_CD_STASH_NO_SPACE _HRESULT_TYPEDEF_(0xc00d11d5) +#define NS_E_WMP_DRM_NEW_HARDWARE _HRESULT_TYPEDEF_(0xc00d11d6) +#define NS_E_WMP_DRM_INVALID_SIG _HRESULT_TYPEDEF_(0xc00d11d7) +#define NS_E_WMP_DRM_CANNOT_RESTORE _HRESULT_TYPEDEF_(0xc00d11d8) +#define NS_E_WMP_BURN_DISC_OVERFLOW _HRESULT_TYPEDEF_(0xc00d11d9) +#define NS_E_WMP_DRM_GENERIC_LICENSE_FAILURE _HRESULT_TYPEDEF_(0xc00d11da) +#define NS_E_WMP_DRM_NO_SECURE_CLOCK _HRESULT_TYPEDEF_(0xc00d11db) +#define NS_E_WMP_DRM_NO_RIGHTS _HRESULT_TYPEDEF_(0xc00d11dc) +#define NS_E_WMP_DRM_INDIV_FAILED _HRESULT_TYPEDEF_(0xc00d11dd) +#define NS_E_WMP_SERVER_NONEWCONNECTIONS _HRESULT_TYPEDEF_(0xc00d11de) +#define NS_E_WMP_MULTIPLE_ERROR_IN_PLAYLIST _HRESULT_TYPEDEF_(0xc00d11df) +#define NS_E_WMP_IMAPI2_ERASE_FAIL _HRESULT_TYPEDEF_(0xc00d11e0) +#define NS_E_WMP_IMAPI2_ERASE_DEVICE_BUSY _HRESULT_TYPEDEF_(0xc00d11e1) +#define NS_E_WMP_DRM_COMPONENT_FAILURE _HRESULT_TYPEDEF_(0xc00d11e2) +#define NS_E_WMP_DRM_NO_DEVICE_CERT _HRESULT_TYPEDEF_(0xc00d11e3) +#define NS_E_WMP_SERVER_SECURITY_ERROR _HRESULT_TYPEDEF_(0xc00d11e4) +#define NS_E_WMP_AUDIO_DEVICE_LOST _HRESULT_TYPEDEF_(0xc00d11e5) +#define NS_E_WMP_IMAPI_MEDIA_INCOMPATIBLE _HRESULT_TYPEDEF_(0xc00d11e6) +#define NS_E_SYNCWIZ_DEVICE_FULL _HRESULT_TYPEDEF_(0xc00d11ee) +#define NS_E_SYNCWIZ_CANNOT_CHANGE_SETTINGS _HRESULT_TYPEDEF_(0xc00d11ef) +#define NS_E_TRANSCODE_DELETECACHEERROR _HRESULT_TYPEDEF_(0xc00d11f0) +#define NS_E_CD_NO_BUFFERS_READ _HRESULT_TYPEDEF_(0xc00d11f8) +#define NS_E_CD_EMPTY_TRACK_QUEUE _HRESULT_TYPEDEF_(0xc00d11f9) +#define NS_E_CD_NO_READER _HRESULT_TYPEDEF_(0xc00d11fa) +#define NS_E_CD_ISRC_INVALID _HRESULT_TYPEDEF_(0xc00d11fb) +#define NS_E_CD_MEDIA_CATALOG_NUMBER_INVALID _HRESULT_TYPEDEF_(0xc00d11fc) +#define NS_E_SLOW_READ_DIGITAL_WITH_ERRORCORRECTION _HRESULT_TYPEDEF_(0xc00d11fd) +#define NS_E_CD_SPEEDDETECT_NOT_ENOUGH_READS _HRESULT_TYPEDEF_(0xc00d11fe) +#define NS_E_CD_QUEUEING_DISABLED _HRESULT_TYPEDEF_(0xc00d11ff) +#define NS_E_WMP_DRM_ACQUIRING_LICENSE _HRESULT_TYPEDEF_(0xc00d1202) +#define NS_E_WMP_DRM_LICENSE_EXPIRED _HRESULT_TYPEDEF_(0xc00d1203) +#define NS_E_WMP_DRM_LICENSE_NOTACQUIRED _HRESULT_TYPEDEF_(0xc00d1204) +#define NS_E_WMP_DRM_LICENSE_NOTENABLED _HRESULT_TYPEDEF_(0xc00d1205) +#define NS_E_WMP_DRM_LICENSE_UNUSABLE _HRESULT_TYPEDEF_(0xc00d1206) +#define NS_E_WMP_DRM_LICENSE_CONTENT_REVOKED _HRESULT_TYPEDEF_(0xc00d1207) +#define NS_E_WMP_DRM_LICENSE_NOSAP _HRESULT_TYPEDEF_(0xc00d1208) +#define NS_E_WMP_DRM_UNABLE_TO_ACQUIRE_LICENSE _HRESULT_TYPEDEF_(0xc00d1209) +#define NS_E_WMP_LICENSE_REQUIRED _HRESULT_TYPEDEF_(0xc00d120a) +#define NS_E_WMP_PROTECTED_CONTENT _HRESULT_TYPEDEF_(0xc00d120b) +#define NS_E_WMP_POLICY_VALUE_NOT_CONFIGURED _HRESULT_TYPEDEF_(0xc00d122a) +#define NS_E_PDA_CANNOT_SYNC_FROM_INTERNET _HRESULT_TYPEDEF_(0xc00d1234) +#define NS_E_PDA_CANNOT_SYNC_INVALID_PLAYLIST _HRESULT_TYPEDEF_(0xc00d1235) +#define NS_E_PDA_FAILED_TO_SYNCHRONIZE_FILE _HRESULT_TYPEDEF_(0xc00d1236) +#define NS_E_PDA_SYNC_FAILED _HRESULT_TYPEDEF_(0xc00d1237) +#define NS_E_PDA_DELETE_FAILED _HRESULT_TYPEDEF_(0xc00d1238) +#define NS_E_PDA_FAILED_TO_RETRIEVE_FILE _HRESULT_TYPEDEF_(0xc00d1239) +#define NS_E_PDA_DEVICE_NOT_RESPONDING _HRESULT_TYPEDEF_(0xc00d123a) +#define NS_E_PDA_FAILED_TO_TRANSCODE_PHOTO _HRESULT_TYPEDEF_(0xc00d123b) +#define NS_E_PDA_FAILED_TO_ENCRYPT_TRANSCODED_FILE _HRESULT_TYPEDEF_(0xc00d123c) +#define NS_E_PDA_CANNOT_TRANSCODE_TO_AUDIO _HRESULT_TYPEDEF_(0xc00d123d) +#define NS_E_PDA_CANNOT_TRANSCODE_TO_VIDEO _HRESULT_TYPEDEF_(0xc00d123e) +#define NS_E_PDA_CANNOT_TRANSCODE_TO_IMAGE _HRESULT_TYPEDEF_(0xc00d123f) +#define NS_E_PDA_RETRIEVED_FILE_FILENAME_TOO_LONG _HRESULT_TYPEDEF_(0xc00d1240) +#define NS_E_PDA_CEWMDM_DRM_ERROR _HRESULT_TYPEDEF_(0xc00d1241) +#define NS_E_INCOMPLETE_PLAYLIST _HRESULT_TYPEDEF_(0xc00d1242) +#define NS_E_PDA_SYNC_RUNNING _HRESULT_TYPEDEF_(0xc00d1243) +#define NS_E_PDA_SYNC_LOGIN_ERROR _HRESULT_TYPEDEF_(0xc00d1244) +#define NS_E_PDA_TRANSCODE_CODEC_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d1245) +#define NS_E_CANNOT_SYNC_DRM_TO_NON_JANUS_DEVICE _HRESULT_TYPEDEF_(0xc00d1246) +#define NS_E_CANNOT_SYNC_PREVIOUS_SYNC_RUNNING _HRESULT_TYPEDEF_(0xc00d1247) +#define NS_E_WMP_HWND_NOTFOUND _HRESULT_TYPEDEF_(0xc00d125c) +#define NS_E_BKGDOWNLOAD_WRONG_NO_FILES _HRESULT_TYPEDEF_(0xc00d125d) +#define NS_E_BKGDOWNLOAD_COMPLETECANCELLEDJOB _HRESULT_TYPEDEF_(0xc00d125e) +#define NS_E_BKGDOWNLOAD_CANCELCOMPLETEDJOB _HRESULT_TYPEDEF_(0xc00d125f) +#define NS_E_BKGDOWNLOAD_NOJOBPOINTER _HRESULT_TYPEDEF_(0xc00d1260) +#define NS_E_BKGDOWNLOAD_INVALIDJOBSIGNATURE _HRESULT_TYPEDEF_(0xc00d1261) +#define NS_E_BKGDOWNLOAD_FAILED_TO_CREATE_TEMPFILE _HRESULT_TYPEDEF_(0xc00d1262) +#define NS_E_BKGDOWNLOAD_PLUGIN_FAILEDINITIALIZE _HRESULT_TYPEDEF_(0xc00d1263) +#define NS_E_BKGDOWNLOAD_PLUGIN_FAILEDTOMOVEFILE _HRESULT_TYPEDEF_(0xc00d1264) +#define NS_E_BKGDOWNLOAD_CALLFUNCFAILED _HRESULT_TYPEDEF_(0xc00d1265) +#define NS_E_BKGDOWNLOAD_CALLFUNCTIMEOUT _HRESULT_TYPEDEF_(0xc00d1266) +#define NS_E_BKGDOWNLOAD_CALLFUNCENDED _HRESULT_TYPEDEF_(0xc00d1267) +#define NS_E_BKGDOWNLOAD_WMDUNPACKFAILED _HRESULT_TYPEDEF_(0xc00d1268) +#define NS_E_BKGDOWNLOAD_FAILEDINITIALIZE _HRESULT_TYPEDEF_(0xc00d1269) +#define NS_E_INTERFACE_NOT_REGISTERED_IN_GIT _HRESULT_TYPEDEF_(0xc00d126a) +#define NS_E_BKGDOWNLOAD_INVALID_FILE_NAME _HRESULT_TYPEDEF_(0xc00d126b) +#define NS_E_IMAGE_DOWNLOAD_FAILED _HRESULT_TYPEDEF_(0xc00d128e) +#define NS_E_WMP_UDRM_NOUSERLIST _HRESULT_TYPEDEF_(0xc00d12c0) +#define NS_E_WMP_DRM_NOT_ACQUIRING _HRESULT_TYPEDEF_(0xc00d12c1) +#define NS_E_WMP_BSTR_TOO_LONG _HRESULT_TYPEDEF_(0xc00d12f2) +#define NS_E_WMP_AUTOPLAY_INVALID_STATE _HRESULT_TYPEDEF_(0xc00d12fc) +#define NS_E_WMP_COMPONENT_REVOKED _HRESULT_TYPEDEF_(0xc00d1306) +#define NS_E_CURL_NOTSAFE _HRESULT_TYPEDEF_(0xc00d1324) +#define NS_E_CURL_INVALIDCHAR _HRESULT_TYPEDEF_(0xc00d1325) +#define NS_E_CURL_INVALIDHOSTNAME _HRESULT_TYPEDEF_(0xc00d1326) +#define NS_E_CURL_INVALIDPATH _HRESULT_TYPEDEF_(0xc00d1327) +#define NS_E_CURL_INVALIDSCHEME _HRESULT_TYPEDEF_(0xc00d1328) +#define NS_E_CURL_INVALIDURL _HRESULT_TYPEDEF_(0xc00d1329) +#define NS_E_CURL_CANTWALK _HRESULT_TYPEDEF_(0xc00d132b) +#define NS_E_CURL_INVALIDPORT _HRESULT_TYPEDEF_(0xc00d132c) +#define NS_E_CURLHELPER_NOTADIRECTORY _HRESULT_TYPEDEF_(0xc00d132d) +#define NS_E_CURLHELPER_NOTAFILE _HRESULT_TYPEDEF_(0xc00d132e) +#define NS_E_CURL_CANTDECODE _HRESULT_TYPEDEF_(0xc00d132f) +#define NS_E_CURLHELPER_NOTRELATIVE _HRESULT_TYPEDEF_(0xc00d1330) +#define NS_E_CURL_INVALIDBUFFERSIZE _HRESULT_TYPEDEF_(0xc00d1331) +#define NS_E_SUBSCRIPTIONSERVICE_PLAYBACK_DISALLOWED _HRESULT_TYPEDEF_(0xc00d1356) +#define NS_E_CANNOT_BUY_OR_DOWNLOAD_FROM_MULTIPLE_SERVICES _HRESULT_TYPEDEF_(0xc00d1357) +#define NS_E_CANNOT_BUY_OR_DOWNLOAD_CONTENT _HRESULT_TYPEDEF_(0xc00d1358) +#define NS_S_TRACK_BUY_REQUIRES_ALBUM_PURCHASE _HRESULT_TYPEDEF_(0x000d1359) +#define NS_E_NOT_CONTENT_PARTNER_TRACK _HRESULT_TYPEDEF_(0xc00d135a) +#define NS_E_TRACK_DOWNLOAD_REQUIRES_ALBUM_PURCHASE _HRESULT_TYPEDEF_(0xc00d135b) +#define NS_E_TRACK_DOWNLOAD_REQUIRES_PURCHASE _HRESULT_TYPEDEF_(0xc00d135c) +#define NS_E_TRACK_PURCHASE_MAXIMUM_EXCEEDED _HRESULT_TYPEDEF_(0xc00d135d) +#define NS_S_NAVIGATION_COMPLETE_WITH_ERRORS _HRESULT_TYPEDEF_(0x000d135e) +#define NS_E_SUBSCRIPTIONSERVICE_LOGIN_FAILED _HRESULT_TYPEDEF_(0xc00d135f) +#define NS_E_SUBSCRIPTIONSERVICE_DOWNLOAD_TIMEOUT _HRESULT_TYPEDEF_(0xc00d1360) +#define NS_S_TRACK_ALREADY_DOWNLOADED _HRESULT_TYPEDEF_(0x000d1361) +#define NS_E_CONTENT_PARTNER_STILL_INITIALIZING _HRESULT_TYPEDEF_(0xc00d1362) +#define NS_E_OPEN_CONTAINING_FOLDER_FAILED _HRESULT_TYPEDEF_(0xc00d1363) +#define NS_E_ADVANCEDEDIT_TOO_MANY_PICTURES _HRESULT_TYPEDEF_(0xc00d136a) + +/* Windows Media Server errors */ +#define NS_E_REDIRECT _HRESULT_TYPEDEF_(0xc00d1388) +#define NS_E_STALE_PRESENTATION _HRESULT_TYPEDEF_(0xc00d1389) +#define NS_E_NAMESPACE_WRONG_PERSIST _HRESULT_TYPEDEF_(0xc00d138a) +#define NS_E_NAMESPACE_WRONG_TYPE _HRESULT_TYPEDEF_(0xc00d138b) +#define NS_E_NAMESPACE_NODE_CONFLICT _HRESULT_TYPEDEF_(0xc00d138c) +#define NS_E_NAMESPACE_NODE_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d138d) +#define NS_E_NAMESPACE_BUFFER_TOO_SMALL _HRESULT_TYPEDEF_(0xc00d138e) +#define NS_E_NAMESPACE_TOO_MANY_CALLBACKS _HRESULT_TYPEDEF_(0xc00d138f) +#define NS_E_NAMESPACE_DUPLICATE_CALLBACK _HRESULT_TYPEDEF_(0xc00d1390) +#define NS_E_NAMESPACE_CALLBACK_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d1391) +#define NS_E_NAMESPACE_NAME_TOO_LONG _HRESULT_TYPEDEF_(0xc00d1392) +#define NS_E_NAMESPACE_DUPLICATE_NAME _HRESULT_TYPEDEF_(0xc00d1393) +#define NS_E_NAMESPACE_EMPTY_NAME _HRESULT_TYPEDEF_(0xc00d1394) +#define NS_E_NAMESPACE_INDEX_TOO_LARGE _HRESULT_TYPEDEF_(0xc00d1395) +#define NS_E_NAMESPACE_BAD_NAME _HRESULT_TYPEDEF_(0xc00d1396) +#define NS_E_NAMESPACE_WRONG_SECURITY _HRESULT_TYPEDEF_(0xc00d1397) +#define NS_E_CACHE_ARCHIVE_CONFLICT _HRESULT_TYPEDEF_(0xc00d13ec) +#define NS_E_CACHE_ORIGIN_SERVER_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d13ed) +#define NS_E_CACHE_ORIGIN_SERVER_TIMEOUT _HRESULT_TYPEDEF_(0xc00d13ee) +#define NS_E_CACHE_NOT_BROADCAST _HRESULT_TYPEDEF_(0xc00d13ef) +#define NS_E_CACHE_CANNOT_BE_CACHED _HRESULT_TYPEDEF_(0xc00d13f0) +#define NS_E_CACHE_NOT_MODIFIED _HRESULT_TYPEDEF_(0xc00d13f1) +#define NS_E_CANNOT_REMOVE_PUBLISHING_POINT _HRESULT_TYPEDEF_(0xc00d1450) +#define NS_E_CANNOT_REMOVE_PLUGIN _HRESULT_TYPEDEF_(0xc00d1451) +#define NS_E_WRONG_PUBLISHING_POINT_TYPE _HRESULT_TYPEDEF_(0xc00d1452) +#define NS_E_UNSUPPORTED_LOAD_TYPE _HRESULT_TYPEDEF_(0xc00d1453) +#define NS_E_INVALID_PLUGIN_LOAD_TYPE_CONFIGURATION _HRESULT_TYPEDEF_(0xc00d1454) +#define NS_E_INVALID_PUBLISHING_POINT_NAME _HRESULT_TYPEDEF_(0xc00d1455) +#define NS_E_TOO_MANY_MULTICAST_SINKS _HRESULT_TYPEDEF_(0xc00d1456) +#define NS_E_PUBLISHING_POINT_INVALID_REQUEST_WHILE_STARTED _HRESULT_TYPEDEF_(0xc00d1457) +#define NS_E_MULTICAST_PLUGIN_NOT_ENABLED _HRESULT_TYPEDEF_(0xc00d1458) +#define NS_E_INVALID_OPERATING_SYSTEM_VERSION _HRESULT_TYPEDEF_(0xc00d1459) +#define NS_E_PUBLISHING_POINT_REMOVED _HRESULT_TYPEDEF_(0xc00d145a) +#define NS_E_INVALID_PUSH_PUBLISHING_POINT_START_REQUEST _HRESULT_TYPEDEF_(0xc00d145b) +#define NS_E_UNSUPPORTED_LANGUAGE _HRESULT_TYPEDEF_(0xc00d145c) +#define NS_E_WRONG_OS_VERSION _HRESULT_TYPEDEF_(0xc00d145d) +#define NS_E_PUBLISHING_POINT_STOPPED _HRESULT_TYPEDEF_(0xc00d145e) +#define NS_E_PLAYLIST_ENTRY_ALREADY_PLAYING _HRESULT_TYPEDEF_(0xc00d14b4) +#define NS_E_EMPTY_PLAYLIST _HRESULT_TYPEDEF_(0xc00d14b5) +#define NS_E_PLAYLIST_PARSE_FAILURE _HRESULT_TYPEDEF_(0xc00d14b6) +#define NS_E_PLAYLIST_UNSUPPORTED_ENTRY _HRESULT_TYPEDEF_(0xc00d14b7) +#define NS_E_PLAYLIST_ENTRY_NOT_IN_PLAYLIST _HRESULT_TYPEDEF_(0xc00d14b8) +#define NS_E_PLAYLIST_ENTRY_SEEK _HRESULT_TYPEDEF_(0xc00d14b9) +#define NS_E_PLAYLIST_RECURSIVE_PLAYLISTS _HRESULT_TYPEDEF_(0xc00d14ba) +#define NS_E_PLAYLIST_TOO_MANY_NESTED_PLAYLISTS _HRESULT_TYPEDEF_(0xc00d14bb) +#define NS_E_PLAYLIST_SHUTDOWN _HRESULT_TYPEDEF_(0xc00d14bc) +#define NS_E_PLAYLIST_END_RECEDING _HRESULT_TYPEDEF_(0xc00d14bd) +#define NS_I_PLAYLIST_CHANGE_RECEDING _HRESULT_TYPEDEF_(0x400d14be) +#define NS_E_DATAPATH_NO_SINK _HRESULT_TYPEDEF_(0xc00d1518) +#define NS_S_PUBLISHING_POINT_STARTED_WITH_FAILED_SINKS _HRESULT_TYPEDEF_(0x000d1519) +#define NS_E_INVALID_PUSH_TEMPLATE _HRESULT_TYPEDEF_(0xc00d151a) +#define NS_E_INVALID_PUSH_PUBLISHING_POINT _HRESULT_TYPEDEF_(0xc00d151b) +#define NS_E_CRITICAL_ERROR _HRESULT_TYPEDEF_(0xc00d151c) +#define NS_E_NO_NEW_CONNECTIONS _HRESULT_TYPEDEF_(0xc00d151d) +#define NS_E_WSX_INVALID_VERSION _HRESULT_TYPEDEF_(0xc00d151e) +#define NS_E_HEADER_MISMATCH _HRESULT_TYPEDEF_(0xc00d151f) +#define NS_E_PUSH_DUPLICATE_PUBLISHING_POINT_NAME _HRESULT_TYPEDEF_(0xc00d1520) +#define NS_E_NO_SCRIPT_ENGINE _HRESULT_TYPEDEF_(0xc00d157c) +#define NS_E_PLUGIN_ERROR_REPORTED _HRESULT_TYPEDEF_(0xc00d157d) +#define NS_E_SOURCE_PLUGIN_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d157e) +#define NS_E_PLAYLIST_PLUGIN_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d157f) +#define NS_E_DATA_SOURCE_ENUMERATION_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00d1580) +#define NS_E_MEDIA_PARSER_INVALID_FORMAT _HRESULT_TYPEDEF_(0xc00d1581) +#define NS_E_SCRIPT_DEBUGGER_NOT_INSTALLED _HRESULT_TYPEDEF_(0xc00d1582) +#define NS_E_FEATURE_REQUIRES_ENTERPRISE_SERVER _HRESULT_TYPEDEF_(0xc00d1583) +#define NS_E_WIZARD_RUNNING _HRESULT_TYPEDEF_(0xc00d1584) +#define NS_E_INVALID_LOG_URL _HRESULT_TYPEDEF_(0xc00d1585) +#define NS_E_INVALID_MTU_RANGE _HRESULT_TYPEDEF_(0xc00d1586) +#define NS_E_INVALID_PLAY_STATISTICS _HRESULT_TYPEDEF_(0xc00d1587) +#define NS_E_LOG_NEED_TO_BE_SKIPPED _HRESULT_TYPEDEF_(0xc00d1588) +#define NS_E_HTTP_TEXT_DATACONTAINER_SIZE_LIMIT_EXCEEDED _HRESULT_TYPEDEF_(0xc00d1589) +#define NS_E_PORT_IN_USE _HRESULT_TYPEDEF_(0xc00d158a) +#define NS_E_PORT_IN_USE_HTTP _HRESULT_TYPEDEF_(0xc00d158b) +#define NS_E_HTTP_TEXT_DATACONTAINER_INVALID_SERVER_RESPONSE _HRESULT_TYPEDEF_(0xc00d158c) +#define NS_E_ARCHIVE_REACH_QUOTA _HRESULT_TYPEDEF_(0xc00d158d) +#define NS_E_ARCHIVE_ABORT_DUE_TO_BCAST _HRESULT_TYPEDEF_(0xc00d158e) +#define NS_E_ARCHIVE_GAP_DETECTED _HRESULT_TYPEDEF_(0xc00d158f) +#define NS_E_AUTHORIZATION_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d1590) + +/* Windows Media Tools errors */ +#define NS_E_BAD_MARKIN _HRESULT_TYPEDEF_(0xc00d1b58) +#define NS_E_BAD_MARKOUT _HRESULT_TYPEDEF_(0xc00d1b59) +#define NS_E_NOMATCHING_MEDIASOURCE _HRESULT_TYPEDEF_(0xc00d1b5a) +#define NS_E_UNSUPPORTED_SOURCETYPE _HRESULT_TYPEDEF_(0xc00d1b5b) +#define NS_E_TOO_MANY_AUDIO _HRESULT_TYPEDEF_(0xc00d1b5c) +#define NS_E_TOO_MANY_VIDEO _HRESULT_TYPEDEF_(0xc00d1b5d) +#define NS_E_NOMATCHING_ELEMENT _HRESULT_TYPEDEF_(0xc00d1b5e) +#define NS_E_MISMATCHED_MEDIACONTENT _HRESULT_TYPEDEF_(0xc00d1b5f) +#define NS_E_CANNOT_DELETE_ACTIVE_SOURCEGROUP _HRESULT_TYPEDEF_(0xc00d1b60) +#define NS_E_AUDIODEVICE_BUSY _HRESULT_TYPEDEF_(0xc00d1b61) +#define NS_E_AUDIODEVICE_UNEXPECTED _HRESULT_TYPEDEF_(0xc00d1b62) +#define NS_E_AUDIODEVICE_BADFORMAT _HRESULT_TYPEDEF_(0xc00d1b63) +#define NS_E_VIDEODEVICE_BUSY _HRESULT_TYPEDEF_(0xc00d1b64) +#define NS_E_VIDEODEVICE_UNEXPECTED _HRESULT_TYPEDEF_(0xc00d1b65) +#define NS_E_INVALIDCALL_WHILE_ENCODER_RUNNING _HRESULT_TYPEDEF_(0xc00d1b66) +#define NS_E_NO_PROFILE_IN_SOURCEGROUP _HRESULT_TYPEDEF_(0xc00d1b67) +#define NS_E_VIDEODRIVER_UNSTABLE _HRESULT_TYPEDEF_(0xc00d1b68) +#define NS_E_VIDCAPSTARTFAILED _HRESULT_TYPEDEF_(0xc00d1b69) +#define NS_E_VIDSOURCECOMPRESSION _HRESULT_TYPEDEF_(0xc00d1b6a) +#define NS_E_VIDSOURCESIZE _HRESULT_TYPEDEF_(0xc00d1b6b) +#define NS_E_ICMQUERYFORMAT _HRESULT_TYPEDEF_(0xc00d1b6c) +#define NS_E_VIDCAPCREATEWINDOW _HRESULT_TYPEDEF_(0xc00d1b6d) +#define NS_E_VIDCAPDRVINUSE _HRESULT_TYPEDEF_(0xc00d1b6e) +#define NS_E_NO_MEDIAFORMAT_IN_SOURCE _HRESULT_TYPEDEF_(0xc00d1b6f) +#define NS_E_NO_VALID_OUTPUT_STREAM _HRESULT_TYPEDEF_(0xc00d1b70) +#define NS_E_NO_VALID_SOURCE_PLUGIN _HRESULT_TYPEDEF_(0xc00d1b71) +#define NS_E_NO_ACTIVE_SOURCEGROUP _HRESULT_TYPEDEF_(0xc00d1b72) +#define NS_E_NO_SCRIPT_STREAM _HRESULT_TYPEDEF_(0xc00d1b73) +#define NS_E_INVALIDCALL_WHILE_ARCHIVAL_RUNNING _HRESULT_TYPEDEF_(0xc00d1b74) +#define NS_E_INVALIDPACKETSIZE _HRESULT_TYPEDEF_(0xc00d1b75) +#define NS_E_PLUGIN_CLSID_INVALID _HRESULT_TYPEDEF_(0xc00d1b76) +#define NS_E_UNSUPPORTED_ARCHIVETYPE _HRESULT_TYPEDEF_(0xc00d1b77) +#define NS_E_UNSUPPORTED_ARCHIVEOPERATION _HRESULT_TYPEDEF_(0xc00d1b78) +#define NS_E_ARCHIVE_FILENAME_NOTSET _HRESULT_TYPEDEF_(0xc00d1b79) +#define NS_E_SOURCEGROUP_NOTPREPARED _HRESULT_TYPEDEF_(0xc00d1b7a) +#define NS_E_PROFILE_MISMATCH _HRESULT_TYPEDEF_(0xc00d1b7b) +#define NS_E_INCORRECTCLIPSETTINGS _HRESULT_TYPEDEF_(0xc00d1b7c) +#define NS_E_NOSTATSAVAILABLE _HRESULT_TYPEDEF_(0xc00d1b7d) +#define NS_E_NOTARCHIVING _HRESULT_TYPEDEF_(0xc00d1b7e) +#define NS_E_INVALIDCALL_WHILE_ENCODER_STOPPED _HRESULT_TYPEDEF_(0xc00d1b7f) +#define NS_E_NOSOURCEGROUPS _HRESULT_TYPEDEF_(0xc00d1b80) +#define NS_E_INVALIDINPUTFPS _HRESULT_TYPEDEF_(0xc00d1b81) +#define NS_E_NO_DATAVIEW_SUPPORT _HRESULT_TYPEDEF_(0xc00d1b82) +#define NS_E_CODEC_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d1b83) +#define NS_E_ARCHIVE_SAME_AS_INPUT _HRESULT_TYPEDEF_(0xc00d1b84) +#define NS_E_SOURCE_NOTSPECIFIED _HRESULT_TYPEDEF_(0xc00d1b85) +#define NS_E_NO_REALTIME_TIMECOMPRESSION _HRESULT_TYPEDEF_(0xc00d1b86) +#define NS_E_UNSUPPORTED_ENCODER_DEVICE _HRESULT_TYPEDEF_(0xc00d1b87) +#define NS_E_UNEXPECTED_DISPLAY_SETTINGS _HRESULT_TYPEDEF_(0xc00d1b88) +#define NS_E_NO_AUDIODATA _HRESULT_TYPEDEF_(0xc00d1b89) +#define NS_E_INPUTSOURCE_PROBLEM _HRESULT_TYPEDEF_(0xc00d1b8a) +#define NS_E_WME_VERSION_MISMATCH _HRESULT_TYPEDEF_(0xc00d1b8b) +#define NS_E_NO_REALTIME_PREPROCESS _HRESULT_TYPEDEF_(0xc00d1b8c) +#define NS_E_NO_REPEAT_PREPROCESS _HRESULT_TYPEDEF_(0xc00d1b8d) +#define NS_E_CANNOT_PAUSE_LIVEBROADCAST _HRESULT_TYPEDEF_(0xc00d1b8e) +#define NS_E_DRM_PROFILE_NOT_SET _HRESULT_TYPEDEF_(0xc00d1b8f) +#define NS_E_DUPLICATE_DRMPROFILE _HRESULT_TYPEDEF_(0xc00d1b90) +#define NS_E_INVALID_DEVICE _HRESULT_TYPEDEF_(0xc00d1b91) +#define NS_E_SPEECHEDL_ON_NON_MIXEDMODE _HRESULT_TYPEDEF_(0xc00d1b92) +#define NS_E_DRM_PASSWORD_TOO_LONG _HRESULT_TYPEDEF_(0xc00d1b93) +#define NS_E_DEVCONTROL_FAILED_SEEK _HRESULT_TYPEDEF_(0xc00d1b94) +#define NS_E_INTERLACE_REQUIRE_SAMESIZE _HRESULT_TYPEDEF_(0xc00d1b95) +#define NS_E_TOO_MANY_DEVICECONTROL _HRESULT_TYPEDEF_(0xc00d1b96) +#define NS_E_NO_MULTIPASS_FOR_LIVEDEVICE _HRESULT_TYPEDEF_(0xc00d1b97) +#define NS_E_MISSING_AUDIENCE _HRESULT_TYPEDEF_(0xc00d1b98) +#define NS_E_AUDIENCE_CONTENTTYPE_MISMATCH _HRESULT_TYPEDEF_(0xc00d1b99) +#define NS_E_MISSING_SOURCE_INDEX _HRESULT_TYPEDEF_(0xc00d1b9a) +#define NS_E_NUM_LANGUAGE_MISMATCH _HRESULT_TYPEDEF_(0xc00d1b9b) +#define NS_E_LANGUAGE_MISMATCH _HRESULT_TYPEDEF_(0xc00d1b9c) +#define NS_E_VBRMODE_MISMATCH _HRESULT_TYPEDEF_(0xc00d1b9d) +#define NS_E_INVALID_INPUT_AUDIENCE_INDEX _HRESULT_TYPEDEF_(0xc00d1b9e) +#define NS_E_INVALID_INPUT_LANGUAGE _HRESULT_TYPEDEF_(0xc00d1b9f) +#define NS_E_INVALID_INPUT_STREAM _HRESULT_TYPEDEF_(0xc00d1ba0) +#define NS_E_EXPECT_MONO_WAV_INPUT _HRESULT_TYPEDEF_(0xc00d1ba1) +#define NS_E_INPUT_WAVFORMAT_MISMATCH _HRESULT_TYPEDEF_(0xc00d1ba2) +#define NS_E_RECORDQ_DISK_FULL _HRESULT_TYPEDEF_(0xc00d1ba3) +#define NS_E_NO_PAL_INVERSE_TELECINE _HRESULT_TYPEDEF_(0xc00d1ba4) +#define NS_E_ACTIVE_SG_DEVICE_DISCONNECTED _HRESULT_TYPEDEF_(0xc00d1ba5) +#define NS_E_ACTIVE_SG_DEVICE_CONTROL_DISCONNECTED _HRESULT_TYPEDEF_(0xc00d1ba6) +#define NS_E_NO_FRAMES_SUBMITTED_TO_ANALYZER _HRESULT_TYPEDEF_(0xc00d1ba7) +#define NS_E_INPUT_DOESNOT_SUPPORT_SMPTE _HRESULT_TYPEDEF_(0xc00d1ba8) +#define NS_E_NO_SMPTE_WITH_MULTIPLE_SOURCEGROUPS _HRESULT_TYPEDEF_(0xc00d1ba9) +#define NS_E_BAD_CONTENTEDL _HRESULT_TYPEDEF_(0xc00d1baa) +#define NS_E_INTERLACEMODE_MISMATCH _HRESULT_TYPEDEF_(0xc00d1bab) +#define NS_E_NONSQUAREPIXELMODE_MISMATCH _HRESULT_TYPEDEF_(0xc00d1bac) +#define NS_E_SMPTEMODE_MISMATCH _HRESULT_TYPEDEF_(0xc00d1bad) +#define NS_E_END_OF_TAPE _HRESULT_TYPEDEF_(0xc00d1bae) +#define NS_E_NO_MEDIA_IN_AUDIENCE _HRESULT_TYPEDEF_(0xc00d1baf) +#define NS_E_NO_AUDIENCES _HRESULT_TYPEDEF_(0xc00d1bb0) +#define NS_E_NO_AUDIO_COMPAT _HRESULT_TYPEDEF_(0xc00d1bb1) +#define NS_E_INVALID_VBR_COMPAT _HRESULT_TYPEDEF_(0xc00d1bb2) +#define NS_E_NO_PROFILE_NAME _HRESULT_TYPEDEF_(0xc00d1bb3) +#define NS_E_INVALID_VBR_WITH_UNCOMP _HRESULT_TYPEDEF_(0xc00d1bb4) +#define NS_E_MULTIPLE_VBR_AUDIENCES _HRESULT_TYPEDEF_(0xc00d1bb5) +#define NS_E_UNCOMP_COMP_COMBINATION _HRESULT_TYPEDEF_(0xc00d1bb6) +#define NS_E_MULTIPLE_AUDIO_CODECS _HRESULT_TYPEDEF_(0xc00d1bb7) +#define NS_E_MULTIPLE_AUDIO_FORMATS _HRESULT_TYPEDEF_(0xc00d1bb8) +#define NS_E_AUDIO_BITRATE_STEPDOWN _HRESULT_TYPEDEF_(0xc00d1bb9) +#define NS_E_INVALID_AUDIO_PEAKRATE _HRESULT_TYPEDEF_(0xc00d1bba) +#define NS_E_INVALID_AUDIO_PEAKRATE_2 _HRESULT_TYPEDEF_(0xc00d1bbb) +#define NS_E_INVALID_AUDIO_BUFFERMAX _HRESULT_TYPEDEF_(0xc00d1bbc) +#define NS_E_MULTIPLE_VIDEO_CODECS _HRESULT_TYPEDEF_(0xc00d1bbd) +#define NS_E_MULTIPLE_VIDEO_SIZES _HRESULT_TYPEDEF_(0xc00d1bbe) +#define NS_E_INVALID_VIDEO_BITRATE _HRESULT_TYPEDEF_(0xc00d1bbf) +#define NS_E_VIDEO_BITRATE_STEPDOWN _HRESULT_TYPEDEF_(0xc00d1bc0) +#define NS_E_INVALID_VIDEO_PEAKRATE _HRESULT_TYPEDEF_(0xc00d1bc1) +#define NS_E_INVALID_VIDEO_PEAKRATE_2 _HRESULT_TYPEDEF_(0xc00d1bc2) +#define NS_E_INVALID_VIDEO_WIDTH _HRESULT_TYPEDEF_(0xc00d1bc3) +#define NS_E_INVALID_VIDEO_HEIGHT _HRESULT_TYPEDEF_(0xc00d1bc4) +#define NS_E_INVALID_VIDEO_FPS _HRESULT_TYPEDEF_(0xc00d1bc5) +#define NS_E_INVALID_VIDEO_KEYFRAME _HRESULT_TYPEDEF_(0xc00d1bc6) +#define NS_E_INVALID_VIDEO_IQUALITY _HRESULT_TYPEDEF_(0xc00d1bc7) +#define NS_E_INVALID_VIDEO_CQUALITY _HRESULT_TYPEDEF_(0xc00d1bc8) +#define NS_E_INVALID_VIDEO_BUFFER _HRESULT_TYPEDEF_(0xc00d1bc9) +#define NS_E_INVALID_VIDEO_BUFFERMAX _HRESULT_TYPEDEF_(0xc00d1bca) +#define NS_E_INVALID_VIDEO_BUFFERMAX_2 _HRESULT_TYPEDEF_(0xc00d1bcb) +#define NS_E_INVALID_VIDEO_WIDTH_ALIGN _HRESULT_TYPEDEF_(0xc00d1bcc) +#define NS_E_INVALID_VIDEO_HEIGHT_ALIGN _HRESULT_TYPEDEF_(0xc00d1bcd) +#define NS_E_MULTIPLE_SCRIPT_BITRATES _HRESULT_TYPEDEF_(0xc00d1bce) +#define NS_E_INVALID_SCRIPT_BITRATE _HRESULT_TYPEDEF_(0xc00d1bcf) +#define NS_E_MULTIPLE_FILE_BITRATES _HRESULT_TYPEDEF_(0xc00d1bd0) +#define NS_E_INVALID_FILE_BITRATE _HRESULT_TYPEDEF_(0xc00d1bd1) +#define NS_E_SAME_AS_INPUT_COMBINATION _HRESULT_TYPEDEF_(0xc00d1bd2) +#define NS_E_SOURCE_CANNOT_LOOP _HRESULT_TYPEDEF_(0xc00d1bd3) +#define NS_E_INVALID_FOLDDOWN_COEFFICIENTS _HRESULT_TYPEDEF_(0xc00d1bd4) +#define NS_E_DRMPROFILE_NOTFOUND _HRESULT_TYPEDEF_(0xc00d1bd5) +#define NS_E_INVALID_TIMECODE _HRESULT_TYPEDEF_(0xc00d1bd6) +#define NS_E_NO_AUDIO_TIMECOMPRESSION _HRESULT_TYPEDEF_(0xc00d1bd7) +#define NS_E_NO_TWOPASS_TIMECOMPRESSION _HRESULT_TYPEDEF_(0xc00d1bd8) +#define NS_E_TIMECODE_REQUIRES_VIDEOSTREAM _HRESULT_TYPEDEF_(0xc00d1bd9) +#define NS_E_NO_MBR_WITH_TIMECODE _HRESULT_TYPEDEF_(0xc00d1bda) +#define NS_E_INVALID_INTERLACEMODE _HRESULT_TYPEDEF_(0xc00d1bdb) +#define NS_E_INVALID_INTERLACE_COMPAT _HRESULT_TYPEDEF_(0xc00d1bdc) +#define NS_E_INVALID_NONSQUAREPIXEL_COMPAT _HRESULT_TYPEDEF_(0xc00d1bdd) +#define NS_E_INVALID_SOURCE_WITH_DEVICE_CONTROL _HRESULT_TYPEDEF_(0xc00d1bde) +#define NS_E_CANNOT_GENERATE_BROADCAST_INFO_FOR_QUALITYVBR _HRESULT_TYPEDEF_(0xc00d1bdf) +#define NS_E_EXCEED_MAX_DRM_PROFILE_LIMIT _HRESULT_TYPEDEF_(0xc00d1be0) +#define NS_E_DEVICECONTROL_UNSTABLE _HRESULT_TYPEDEF_(0xc00d1be1) +#define NS_E_INVALID_PIXEL_ASPECT_RATIO _HRESULT_TYPEDEF_(0xc00d1be2) +#define NS_E_AUDIENCE__LANGUAGE_CONTENTTYPE_MISMATCH _HRESULT_TYPEDEF_(0xc00d1be3) +#define NS_E_INVALID_PROFILE_CONTENTTYPE _HRESULT_TYPEDEF_(0xc00d1be4) +#define NS_E_TRANSFORM_PLUGIN_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d1be5) +#define NS_E_TRANSFORM_PLUGIN_INVALID _HRESULT_TYPEDEF_(0xc00d1be6) +#define NS_E_EDL_REQUIRED_FOR_DEVICE_MULTIPASS _HRESULT_TYPEDEF_(0xc00d1be7) +#define NS_E_INVALID_VIDEO_WIDTH_FOR_INTERLACED_ENCODING _HRESULT_TYPEDEF_(0xc00d1be8) +#define NS_E_MARKIN_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d1be9) + +/* DRM errors */ +#define NS_E_DRM_INVALID_APPLICATION _HRESULT_TYPEDEF_(0xc00d2711) +#define NS_E_DRM_LICENSE_STORE_ERROR _HRESULT_TYPEDEF_(0xc00d2712) +#define NS_E_DRM_SECURE_STORE_ERROR _HRESULT_TYPEDEF_(0xc00d2713) +#define NS_E_DRM_LICENSE_STORE_SAVE_ERROR _HRESULT_TYPEDEF_(0xc00d2714) +#define NS_E_DRM_SECURE_STORE_UNLOCK_ERROR _HRESULT_TYPEDEF_(0xc00d2715) +#define NS_E_DRM_INVALID_CONTENT _HRESULT_TYPEDEF_(0xc00d2716) +#define NS_E_DRM_UNABLE_TO_OPEN_LICENSE _HRESULT_TYPEDEF_(0xc00d2717) +#define NS_E_DRM_INVALID_LICENSE _HRESULT_TYPEDEF_(0xc00d2718) +#define NS_E_DRM_INVALID_MACHINE _HRESULT_TYPEDEF_(0xc00d2719) +#define NS_E_DRM_ENUM_LICENSE_FAILED _HRESULT_TYPEDEF_(0xc00d271b) +#define NS_E_DRM_INVALID_LICENSE_REQUEST _HRESULT_TYPEDEF_(0xc00d271c) +#define NS_E_DRM_UNABLE_TO_INITIALIZE _HRESULT_TYPEDEF_(0xc00d271d) +#define NS_E_DRM_UNABLE_TO_ACQUIRE_LICENSE _HRESULT_TYPEDEF_(0xc00d271e) +#define NS_E_DRM_INVALID_LICENSE_ACQUIRED _HRESULT_TYPEDEF_(0xc00d271f) +#define NS_E_DRM_NO_RIGHTS _HRESULT_TYPEDEF_(0xc00d2720) +#define NS_E_DRM_KEY_ERROR _HRESULT_TYPEDEF_(0xc00d2721) +#define NS_E_DRM_ENCRYPT_ERROR _HRESULT_TYPEDEF_(0xc00d2722) +#define NS_E_DRM_DECRYPT_ERROR _HRESULT_TYPEDEF_(0xc00d2723) +#define NS_E_DRM_LICENSE_INVALID_XML _HRESULT_TYPEDEF_(0xc00d2725) +#define NS_S_DRM_LICENSE_ACQUIRED _HRESULT_TYPEDEF_(0x000d2726) +#define NS_S_DRM_INDIVIDUALIZED _HRESULT_TYPEDEF_(0x000d2727) +#define NS_E_DRM_NEEDS_INDIVIDUALIZATION _HRESULT_TYPEDEF_(0xc00d2728) +#define NS_E_DRM_ALREADY_INDIVIDUALIZED _HRESULT_TYPEDEF_(0xc00d2729) +#define NS_E_DRM_ACTION_NOT_QUERIED _HRESULT_TYPEDEF_(0xc00d272a) +#define NS_E_DRM_ACQUIRING_LICENSE _HRESULT_TYPEDEF_(0xc00d272b) +#define NS_E_DRM_INDIVIDUALIZING _HRESULT_TYPEDEF_(0xc00d272c) +#define NS_E_BACKUP_RESTORE_FAILURE _HRESULT_TYPEDEF_(0xc00d272d) +#define NS_E_BACKUP_RESTORE_BAD_REQUEST_ID _HRESULT_TYPEDEF_(0xc00d272e) +#define NS_E_DRM_PARAMETERS_MISMATCHED _HRESULT_TYPEDEF_(0xc00d272f) +#define NS_E_DRM_UNABLE_TO_CREATE_LICENSE_OBJECT _HRESULT_TYPEDEF_(0xc00d2730) +#define NS_E_DRM_UNABLE_TO_CREATE_INDI_OBJECT _HRESULT_TYPEDEF_(0xc00d2731) +#define NS_E_DRM_UNABLE_TO_CREATE_ENCRYPT_OBJECT _HRESULT_TYPEDEF_(0xc00d2732) +#define NS_E_DRM_UNABLE_TO_CREATE_DECRYPT_OBJECT _HRESULT_TYPEDEF_(0xc00d2733) +#define NS_E_DRM_UNABLE_TO_CREATE_PROPERTIES_OBJECT _HRESULT_TYPEDEF_(0xc00d2734) +#define NS_E_DRM_UNABLE_TO_CREATE_BACKUP_OBJECT _HRESULT_TYPEDEF_(0xc00d2735) +#define NS_E_DRM_INDIVIDUALIZE_ERROR _HRESULT_TYPEDEF_(0xc00d2736) +#define NS_E_DRM_LICENSE_OPEN_ERROR _HRESULT_TYPEDEF_(0xc00d2737) +#define NS_E_DRM_LICENSE_CLOSE_ERROR _HRESULT_TYPEDEF_(0xc00d2738) +#define NS_E_DRM_GET_LICENSE_ERROR _HRESULT_TYPEDEF_(0xc00d2739) +#define NS_E_DRM_QUERY_ERROR _HRESULT_TYPEDEF_(0xc00d273a) +#define NS_E_DRM_REPORT_ERROR _HRESULT_TYPEDEF_(0xc00d273b) +#define NS_E_DRM_GET_LICENSESTRING_ERROR _HRESULT_TYPEDEF_(0xc00d273c) +#define NS_E_DRM_GET_CONTENTSTRING_ERROR _HRESULT_TYPEDEF_(0xc00d273d) +#define NS_E_DRM_MONITOR_ERROR _HRESULT_TYPEDEF_(0xc00d273e) +#define NS_E_DRM_UNABLE_TO_SET_PARAMETER _HRESULT_TYPEDEF_(0xc00d273f) +#define NS_E_DRM_INVALID_APPDATA _HRESULT_TYPEDEF_(0xc00d2740) +#define NS_E_DRM_INVALID_APPDATA_VERSION _HRESULT_TYPEDEF_(0xc00d2741) +#define NS_E_DRM_BACKUP_EXISTS _HRESULT_TYPEDEF_(0xc00d2742) +#define NS_E_DRM_BACKUP_CORRUPT _HRESULT_TYPEDEF_(0xc00d2743) +#define NS_E_DRM_BACKUPRESTORE_BUSY _HRESULT_TYPEDEF_(0xc00d2744) +#define NS_E_BACKUP_RESTORE_BAD_DATA _HRESULT_TYPEDEF_(0xc00d2745) +#define NS_S_DRM_MONITOR_CANCELLED _HRESULT_TYPEDEF_(0x000d2746) +#define NS_S_DRM_ACQUIRE_CANCELLED _HRESULT_TYPEDEF_(0x000d2747) +#define NS_E_DRM_LICENSE_UNUSABLE _HRESULT_TYPEDEF_(0xc00d2748) +#define NS_E_DRM_INVALID_PROPERTY _HRESULT_TYPEDEF_(0xc00d2749) +#define NS_E_DRM_SECURE_STORE_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d274a) +#define NS_E_DRM_CACHED_CONTENT_ERROR _HRESULT_TYPEDEF_(0xc00d274b) +#define NS_E_DRM_INDIVIDUALIZATION_INCOMPLETE _HRESULT_TYPEDEF_(0xc00d274c) +#define NS_E_DRM_DRIVER_AUTH_FAILURE _HRESULT_TYPEDEF_(0xc00d274d) +#define NS_E_DRM_NEED_UPGRADE_MSSAP _HRESULT_TYPEDEF_(0xc00d274e) +#define NS_E_DRM_REOPEN_CONTENT _HRESULT_TYPEDEF_(0xc00d274f) +#define NS_E_DRM_DRIVER_DIGIOUT_FAILURE _HRESULT_TYPEDEF_(0xc00d2750) +#define NS_E_DRM_INVALID_SECURESTORE_PASSWORD _HRESULT_TYPEDEF_(0xc00d2751) +#define NS_E_DRM_APPCERT_REVOKED _HRESULT_TYPEDEF_(0xc00d2752) +#define NS_E_DRM_RESTORE_FRAUD _HRESULT_TYPEDEF_(0xc00d2753) +#define NS_E_DRM_HARDWARE_INCONSISTENT _HRESULT_TYPEDEF_(0xc00d2754) +#define NS_E_DRM_SDMI_TRIGGER _HRESULT_TYPEDEF_(0xc00d2755) +#define NS_E_DRM_SDMI_NOMORECOPIES _HRESULT_TYPEDEF_(0xc00d2756) +#define NS_E_DRM_UNABLE_TO_CREATE_HEADER_OBJECT _HRESULT_TYPEDEF_(0xc00d2757) +#define NS_E_DRM_UNABLE_TO_CREATE_KEYS_OBJECT _HRESULT_TYPEDEF_(0xc00d2758) +#define NS_E_DRM_LICENSE_NOTACQUIRED _HRESULT_TYPEDEF_(0xc00d2759) +#define NS_E_DRM_UNABLE_TO_CREATE_CODING_OBJECT _HRESULT_TYPEDEF_(0xc00d275a) +#define NS_E_DRM_UNABLE_TO_CREATE_STATE_DATA_OBJECT _HRESULT_TYPEDEF_(0xc00d275b) +#define NS_E_DRM_BUFFER_TOO_SMALL _HRESULT_TYPEDEF_(0xc00d275c) +#define NS_E_DRM_UNSUPPORTED_PROPERTY _HRESULT_TYPEDEF_(0xc00d275d) +#define NS_E_DRM_ERROR_BAD_NET_RESP _HRESULT_TYPEDEF_(0xc00d275e) +#define NS_E_DRM_STORE_NOTALLSTORED _HRESULT_TYPEDEF_(0xc00d275f) +#define NS_E_DRM_SECURITY_COMPONENT_SIGNATURE_INVALID _HRESULT_TYPEDEF_(0xc00d2760) +#define NS_E_DRM_INVALID_DATA _HRESULT_TYPEDEF_(0xc00d2761) +#define NS_E_DRM_POLICY_DISABLE_ONLINE _HRESULT_TYPEDEF_(0xc00d2762) +#define NS_E_DRM_UNABLE_TO_CREATE_AUTHENTICATION_OBJECT _HRESULT_TYPEDEF_(0xc00d2763) +#define NS_E_DRM_NOT_CONFIGURED _HRESULT_TYPEDEF_(0xc00d2764) +#define NS_E_DRM_DEVICE_ACTIVATION_CANCELED _HRESULT_TYPEDEF_(0xc00d2765) +#define NS_E_BACKUP_RESTORE_TOO_MANY_RESETS _HRESULT_TYPEDEF_(0xc00d2766) +#define NS_E_DRM_DEBUGGING_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d2767) +#define NS_E_DRM_OPERATION_CANCELED _HRESULT_TYPEDEF_(0xc00d2768) +#define NS_E_DRM_RESTRICTIONS_NOT_RETRIEVED _HRESULT_TYPEDEF_(0xc00d2769) +#define NS_E_DRM_UNABLE_TO_CREATE_PLAYLIST_OBJECT _HRESULT_TYPEDEF_(0xc00d276a) +#define NS_E_DRM_UNABLE_TO_CREATE_PLAYLIST_BURN_OBJECT _HRESULT_TYPEDEF_(0xc00d276b) +#define NS_E_DRM_UNABLE_TO_CREATE_DEVICE_REGISTRATION_OBJECT _HRESULT_TYPEDEF_(0xc00d276c) +#define NS_E_DRM_UNABLE_TO_CREATE_METERING_OBJECT _HRESULT_TYPEDEF_(0xc00d276d) +#define NS_S_DRM_BURNABLE_TRACK _HRESULT_TYPEDEF_(0x000d276e) +#define NS_S_DRM_BURNABLE_TRACK_WITH_PLAYLIST_RESTRICTION _HRESULT_TYPEDEF_(0x000d276f) +#define NS_E_DRM_TRACK_EXCEEDED_PLAYLIST_RESTICTION _HRESULT_TYPEDEF_(0xc00d2770) +#define NS_E_DRM_TRACK_EXCEEDED_TRACKBURN_RESTRICTION _HRESULT_TYPEDEF_(0xc00d2771) +#define NS_E_DRM_UNABLE_TO_GET_DEVICE_CERT _HRESULT_TYPEDEF_(0xc00d2772) +#define NS_E_DRM_UNABLE_TO_GET_SECURE_CLOCK _HRESULT_TYPEDEF_(0xc00d2773) +#define NS_E_DRM_UNABLE_TO_SET_SECURE_CLOCK _HRESULT_TYPEDEF_(0xc00d2774) +#define NS_E_DRM_UNABLE_TO_GET_SECURE_CLOCK_FROM_SERVER _HRESULT_TYPEDEF_(0xc00d2775) +#define NS_E_DRM_POLICY_METERING_DISABLED _HRESULT_TYPEDEF_(0xc00d2776) +#define NS_E_DRM_TRANSFER_CHAINED_LICENSES_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d2777) +#define NS_E_DRM_SDK_VERSIONMISMATCH _HRESULT_TYPEDEF_(0xc00d2778) +#define NS_E_DRM_LIC_NEEDS_DEVICE_CLOCK_SET _HRESULT_TYPEDEF_(0xc00d2779) +#define NS_E_LICENSE_HEADER_MISSING_URL _HRESULT_TYPEDEF_(0xc00d277a) +#define NS_E_DEVICE_NOT_WMDRM_DEVICE _HRESULT_TYPEDEF_(0xc00d277b) +#define NS_E_DRM_INVALID_APPCERT _HRESULT_TYPEDEF_(0xc00d277c) +#define NS_E_DRM_PROTOCOL_FORCEFUL_TERMINATION_ON_PETITION _HRESULT_TYPEDEF_(0xc00d277d) +#define NS_E_DRM_PROTOCOL_FORCEFUL_TERMINATION_ON_CHALLENGE _HRESULT_TYPEDEF_(0xc00d277e) +#define NS_E_DRM_CHECKPOINT_FAILED _HRESULT_TYPEDEF_(0xc00d277f) +#define NS_E_DRM_BB_UNABLE_TO_INITIALIZE _HRESULT_TYPEDEF_(0xc00d2780) +#define NS_E_DRM_UNABLE_TO_LOAD_HARDWARE_ID _HRESULT_TYPEDEF_(0xc00d2781) +#define NS_E_DRM_UNABLE_TO_OPEN_DATA_STORE _HRESULT_TYPEDEF_(0xc00d2782) +#define NS_E_DRM_DATASTORE_CORRUPT _HRESULT_TYPEDEF_(0xc00d2783) +#define NS_E_DRM_UNABLE_TO_CREATE_INMEMORYSTORE_OBJECT _HRESULT_TYPEDEF_(0xc00d2784) +#define NS_E_DRM_STUBLIB_REQUIRED _HRESULT_TYPEDEF_(0xc00d2785) +#define NS_E_DRM_UNABLE_TO_CREATE_CERTIFICATE_OBJECT _HRESULT_TYPEDEF_(0xc00d2786) +#define NS_E_DRM_MIGRATION_TARGET_NOT_ONLINE _HRESULT_TYPEDEF_(0xc00d2787) +#define NS_E_DRM_INVALID_MIGRATION_IMAGE _HRESULT_TYPEDEF_(0xc00d2788) +#define NS_E_DRM_MIGRATION_TARGET_STATES_CORRUPTED _HRESULT_TYPEDEF_(0xc00d2789) +#define NS_E_DRM_MIGRATION_IMPORTER_NOT_AVAILABLE _HRESULT_TYPEDEF_(0xc00d278a) +#define NS_DRM_E_MIGRATION_UPGRADE_WITH_DIFF_SID _HRESULT_TYPEDEF_(0xc00d278b) +#define NS_DRM_E_MIGRATION_SOURCE_MACHINE_IN_USE _HRESULT_TYPEDEF_(0xc00d278c) +#define NS_DRM_E_MIGRATION_TARGET_MACHINE_LESS_THAN_LH _HRESULT_TYPEDEF_(0xc00d278d) +#define NS_DRM_E_MIGRATION_IMAGE_ALREADY_EXISTS _HRESULT_TYPEDEF_(0xc00d278e) +#define NS_E_DRM_HARDWAREID_MISMATCH _HRESULT_TYPEDEF_(0xc00d278f) +#define NS_E_INVALID_DRMV2CLT_STUBLIB _HRESULT_TYPEDEF_(0xc00d2790) +#define NS_E_DRM_MIGRATION_INVALID_LEGACYV2_DATA _HRESULT_TYPEDEF_(0xc00d2791) +#define NS_E_DRM_MIGRATION_LICENSE_ALREADY_EXISTS _HRESULT_TYPEDEF_(0xc00d2792) +#define NS_E_DRM_MIGRATION_INVALID_LEGACYV2_SST_PASSWORD _HRESULT_TYPEDEF_(0xc00d2793) +#define NS_E_DRM_MIGRATION_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00d2794) +#define NS_E_DRM_UNABLE_TO_CREATE_MIGRATION_IMPORTER_OBJECT _HRESULT_TYPEDEF_(0xc00d2795) +#define NS_E_DRM_CHECKPOINT_MISMATCH _HRESULT_TYPEDEF_(0xc00d2796) +#define NS_E_DRM_CHECKPOINT_CORRUPT _HRESULT_TYPEDEF_(0xc00d2797) +#define NS_E_REG_FLUSH_FAILURE _HRESULT_TYPEDEF_(0xc00d2798) +#define NS_E_HDS_KEY_MISMATCH _HRESULT_TYPEDEF_(0xc00d2799) +#define NS_E_DRM_MIGRATION_OPERATION_CANCELLED _HRESULT_TYPEDEF_(0xc00d279a) +#define NS_E_DRM_MIGRATION_OBJECT_IN_USE _HRESULT_TYPEDEF_(0xc00d279b) +#define NS_E_DRM_MALFORMED_CONTENT_HEADER _HRESULT_TYPEDEF_(0xc00d279c) +#define NS_E_DRM_LICENSE_EXPIRED _HRESULT_TYPEDEF_(0xc00d27d8) +#define NS_E_DRM_LICENSE_NOTENABLED _HRESULT_TYPEDEF_(0xc00d27d9) +#define NS_E_DRM_LICENSE_APPSECLOW _HRESULT_TYPEDEF_(0xc00d27da) +#define NS_E_DRM_STORE_NEEDINDI _HRESULT_TYPEDEF_(0xc00d27db) +#define NS_E_DRM_STORE_NOTALLOWED _HRESULT_TYPEDEF_(0xc00d27dc) +#define NS_E_DRM_LICENSE_APP_NOTALLOWED _HRESULT_TYPEDEF_(0xc00d27dd) +#define NS_S_DRM_NEEDS_INDIVIDUALIZATION _HRESULT_TYPEDEF_(0x000d27de) +#define NS_E_DRM_LICENSE_CERT_EXPIRED _HRESULT_TYPEDEF_(0xc00d27df) +#define NS_E_DRM_LICENSE_SECLOW _HRESULT_TYPEDEF_(0xc00d27e0) +#define NS_E_DRM_LICENSE_CONTENT_REVOKED _HRESULT_TYPEDEF_(0xc00d27e1) +#define NS_E_DRM_DEVICE_NOT_REGISTERED _HRESULT_TYPEDEF_(0xc00d27e2) +#define NS_E_DRM_LICENSE_NOSAP _HRESULT_TYPEDEF_(0xc00d280a) +#define NS_E_DRM_LICENSE_NOSVP _HRESULT_TYPEDEF_(0xc00d280b) +#define NS_E_DRM_LICENSE_NOWDM _HRESULT_TYPEDEF_(0xc00d280c) +#define NS_E_DRM_LICENSE_NOTRUSTEDCODEC _HRESULT_TYPEDEF_(0xc00d280d) +#define NS_E_DRM_SOURCEID_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00d280e) +#define NS_E_DRM_NEEDS_UPGRADE_TEMPFILE _HRESULT_TYPEDEF_(0xc00d283d) +#define NS_E_DRM_NEED_UPGRADE_PD _HRESULT_TYPEDEF_(0xc00d283e) +#define NS_E_DRM_SIGNATURE_FAILURE _HRESULT_TYPEDEF_(0xc00d283f) +#define NS_E_DRM_LICENSE_SERVER_INFO_MISSING _HRESULT_TYPEDEF_(0xc00d2840) +#define NS_E_DRM_BUSY _HRESULT_TYPEDEF_(0xc00d2841) +#define NS_E_DRM_PD_TOO_MANY_DEVICES _HRESULT_TYPEDEF_(0xc00d2842) +#define NS_E_DRM_INDIV_FRAUD _HRESULT_TYPEDEF_(0xc00d2843) +#define NS_E_DRM_INDIV_NO_CABS _HRESULT_TYPEDEF_(0xc00d2844) +#define NS_E_DRM_INDIV_SERVICE_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d2845) +#define NS_E_DRM_RESTORE_SERVICE_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d2846) +#define NS_E_DRM_CLIENT_CODE_EXPIRED _HRESULT_TYPEDEF_(0xc00d2847) +#define NS_E_DRM_NO_UPLINK_LICENSE _HRESULT_TYPEDEF_(0xc00d2848) +#define NS_E_DRM_INVALID_KID _HRESULT_TYPEDEF_(0xc00d2849) +#define NS_E_DRM_LICENSE_INITIALIZATION_ERROR _HRESULT_TYPEDEF_(0xc00d284a) +#define NS_E_DRM_CHAIN_TOO_LONG _HRESULT_TYPEDEF_(0xc00d284c) +#define NS_E_DRM_UNSUPPORTED_ALGORITHM _HRESULT_TYPEDEF_(0xc00d284d) +#define NS_E_DRM_LICENSE_DELETION_ERROR _HRESULT_TYPEDEF_(0xc00d284e) +#define NS_E_DRM_INVALID_CERTIFICATE _HRESULT_TYPEDEF_(0xc00d28a0) +#define NS_E_DRM_CERTIFICATE_REVOKED _HRESULT_TYPEDEF_(0xc00d28a1) +#define NS_E_DRM_LICENSE_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d28a2) +#define NS_E_DRM_DEVICE_LIMIT_REACHED _HRESULT_TYPEDEF_(0xc00d28a3) +#define NS_E_DRM_UNABLE_TO_VERIFY_PROXIMITY _HRESULT_TYPEDEF_(0xc00d28a4) +#define NS_E_DRM_MUST_REGISTER _HRESULT_TYPEDEF_(0xc00d28a5) +#define NS_E_DRM_MUST_APPROVE _HRESULT_TYPEDEF_(0xc00d28a6) +#define NS_E_DRM_MUST_REVALIDATE _HRESULT_TYPEDEF_(0xc00d28a7) +#define NS_E_DRM_INVALID_PROXIMITY_RESPONSE _HRESULT_TYPEDEF_(0xc00d28a8) +#define NS_E_DRM_INVALID_SESSION _HRESULT_TYPEDEF_(0xc00d28a9) +#define NS_E_DRM_DEVICE_NOT_OPEN _HRESULT_TYPEDEF_(0xc00d28aa) +#define NS_E_DRM_DEVICE_ALREADY_REGISTERED _HRESULT_TYPEDEF_(0xc00d28ab) +#define NS_E_DRM_UNSUPPORTED_PROTOCOL_VERSION _HRESULT_TYPEDEF_(0xc00d28ac) +#define NS_E_DRM_UNSUPPORTED_ACTION _HRESULT_TYPEDEF_(0xc00d28ad) +#define NS_E_DRM_CERTIFICATE_SECURITY_LEVEL_INADEQUATE _HRESULT_TYPEDEF_(0xc00d28ae) +#define NS_E_DRM_UNABLE_TO_OPEN_PORT _HRESULT_TYPEDEF_(0xc00d28af) +#define NS_E_DRM_BAD_REQUEST _HRESULT_TYPEDEF_(0xc00d28b0) +#define NS_E_DRM_INVALID_CRL _HRESULT_TYPEDEF_(0xc00d28b1) +#define NS_E_DRM_ATTRIBUTE_TOO_LONG _HRESULT_TYPEDEF_(0xc00d28b2) +#define NS_E_DRM_EXPIRED_LICENSEBLOB _HRESULT_TYPEDEF_(0xc00d28b3) +#define NS_E_DRM_INVALID_LICENSEBLOB _HRESULT_TYPEDEF_(0xc00d28b4) +#define NS_E_DRM_INCLUSION_LIST_REQUIRED _HRESULT_TYPEDEF_(0xc00d28b5) +#define NS_E_DRM_DRMV2CLT_REVOKED _HRESULT_TYPEDEF_(0xc00d28b6) +#define NS_E_DRM_RIV_TOO_SMALL _HRESULT_TYPEDEF_(0xc00d28b7) +#define NS_E_OUTPUT_PROTECTION_LEVEL_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d2904) +#define NS_E_COMPRESSED_DIGITAL_VIDEO_PROTECTION_LEVEL_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d2905) +#define NS_E_UNCOMPRESSED_DIGITAL_VIDEO_PROTECTION_LEVEL_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d2906) +#define NS_E_ANALOG_VIDEO_PROTECTION_LEVEL_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d2907) +#define NS_E_COMPRESSED_DIGITAL_AUDIO_PROTECTION_LEVEL_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d2908) +#define NS_E_UNCOMPRESSED_DIGITAL_AUDIO_PROTECTION_LEVEL_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d2909) +#define NS_E_OUTPUT_PROTECTION_SCHEME_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d290a) + +/* Setup errors */ +#define NS_S_REBOOT_RECOMMENDED _HRESULT_TYPEDEF_(0x000d2af8) +#define NS_S_REBOOT_REQUIRED _HRESULT_TYPEDEF_(0x000d2af9) +#define NS_E_REBOOT_RECOMMENDED _HRESULT_TYPEDEF_(0xc00d2afa) +#define NS_E_REBOOT_REQUIRED _HRESULT_TYPEDEF_(0xc00d2afb) +#define NS_E_SETUP_INCOMPLETE _HRESULT_TYPEDEF_(0xc00d2afc) +#define NS_E_SETUP_DRM_MIGRATION_FAILED _HRESULT_TYPEDEF_(0xc00d2afd) +#define NS_E_SETUP_IGNORABLE_FAILURE _HRESULT_TYPEDEF_(0xc00d2afe) +#define NS_E_SETUP_DRM_MIGRATION_FAILED_AND_IGNORABLE_FAILURE _HRESULT_TYPEDEF_(0xc00d2aff) +#define NS_E_SETUP_BLOCKED _HRESULT_TYPEDEF_(0xc00d2b00) + +/* Networking errors */ +#define NS_E_UNKNOWN_PROTOCOL _HRESULT_TYPEDEF_(0xc00d2ee0) +#define NS_E_REDIRECT_TO_PROXY _HRESULT_TYPEDEF_(0xc00d2ee1) +#define NS_E_INTERNAL_SERVER_ERROR _HRESULT_TYPEDEF_(0xc00d2ee2) +#define NS_E_BAD_REQUEST _HRESULT_TYPEDEF_(0xc00d2ee3) +#define NS_E_ERROR_FROM_PROXY _HRESULT_TYPEDEF_(0xc00d2ee4) +#define NS_E_PROXY_TIMEOUT _HRESULT_TYPEDEF_(0xc00d2ee5) +#define NS_E_SERVER_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d2ee6) +#define NS_E_REFUSED_BY_SERVER _HRESULT_TYPEDEF_(0xc00d2ee7) +#define NS_E_INCOMPATIBLE_SERVER _HRESULT_TYPEDEF_(0xc00d2ee8) +#define NS_E_MULTICAST_DISABLED _HRESULT_TYPEDEF_(0xc00d2ee9) +#define NS_E_INVALID_REDIRECT _HRESULT_TYPEDEF_(0xc00d2eea) +#define NS_E_ALL_PROTOCOLS_DISABLED _HRESULT_TYPEDEF_(0xc00d2eeb) +#define NS_E_MSBD_NO_LONGER_SUPPORTED _HRESULT_TYPEDEF_(0xc00d2eec) +#define NS_E_PROXY_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d2eed) +#define NS_E_CANNOT_CONNECT_TO_PROXY _HRESULT_TYPEDEF_(0xc00d2eee) +#define NS_E_SERVER_DNS_TIMEOUT _HRESULT_TYPEDEF_(0xc00d2eef) +#define NS_E_PROXY_DNS_TIMEOUT _HRESULT_TYPEDEF_(0xc00d2ef0) +#define NS_E_CLOSED_ON_SUSPEND _HRESULT_TYPEDEF_(0xc00d2ef1) +#define NS_E_CANNOT_READ_PLAYLIST_FROM_MEDIASERVER _HRESULT_TYPEDEF_(0xc00d2ef2) +#define NS_E_SESSION_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d2ef3) +#define NS_E_REQUIRE_STREAMING_CLIENT _HRESULT_TYPEDEF_(0xc00d2ef4) +#define NS_E_PLAYLIST_ENTRY_HAS_CHANGED _HRESULT_TYPEDEF_(0xc00d2ef5) +#define NS_E_PROXY_ACCESSDENIED _HRESULT_TYPEDEF_(0xc00d2ef6) +#define NS_E_PROXY_SOURCE_ACCESSDENIED _HRESULT_TYPEDEF_(0xc00d2ef7) +#define NS_E_NETWORK_SINK_WRITE _HRESULT_TYPEDEF_(0xc00d2ef8) +#define NS_E_FIREWALL _HRESULT_TYPEDEF_(0xc00d2ef9) +#define NS_E_MMS_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00d2efa) +#define NS_E_SERVER_ACCESSDENIED _HRESULT_TYPEDEF_(0xc00d2efb) +#define NS_E_RESOURCE_GONE _HRESULT_TYPEDEF_(0xc00d2efc) +#define NS_E_NO_EXISTING_PACKETIZER _HRESULT_TYPEDEF_(0xc00d2efd) +#define NS_E_BAD_SYNTAX_IN_SERVER_RESPONSE _HRESULT_TYPEDEF_(0xc00d2efe) +#define NS_I_RECONNECTED _HRESULT_TYPEDEF_(0x400d2eff) +#define NS_E_RESET_SOCKET_CONNECTION _HRESULT_TYPEDEF_(0xc00d2f00) +#define NS_I_NOLOG_STOP _HRESULT_TYPEDEF_(0x400d2f01) +#define NS_E_TOO_MANY_HOPS _HRESULT_TYPEDEF_(0xc00d2f02) +#define NS_I_EXISTING_PACKETIZER _HRESULT_TYPEDEF_(0x400d2f03) +#define NS_I_MANUAL_PROXY _HRESULT_TYPEDEF_(0x400d2f04) +#define NS_E_TOO_MUCH_DATA_FROM_SERVER _HRESULT_TYPEDEF_(0xc00d2f05) +#define NS_E_CONNECT_TIMEOUT _HRESULT_TYPEDEF_(0xc00d2f06) +#define NS_E_PROXY_CONNECT_TIMEOUT _HRESULT_TYPEDEF_(0xc00d2f07) +#define NS_E_SESSION_INVALID _HRESULT_TYPEDEF_(0xc00d2f08) +#define NS_S_EOSRECEDING _HRESULT_TYPEDEF_(0x000d2f09) +#define NS_E_PACKETSINK_UNKNOWN_FEC_STREAM _HRESULT_TYPEDEF_(0xc00d2f0a) +#define NS_E_PUSH_CANNOTCONNECT _HRESULT_TYPEDEF_(0xc00d2f0b) +#define NS_E_INCOMPATIBLE_PUSH_SERVER _HRESULT_TYPEDEF_(0xc00d2f0c) +#define NS_S_CHANGENOTICE _HRESULT_TYPEDEF_(0x000d2f0d) + +/* Client media service errors */ +#define NS_E_END_OF_PLAYLIST _HRESULT_TYPEDEF_(0xc00d32c8) +#define NS_E_USE_FILE_SOURCE _HRESULT_TYPEDEF_(0xc00d32c9) +#define NS_E_PROPERTY_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d32ca) +#define NS_E_PROPERTY_READ_ONLY _HRESULT_TYPEDEF_(0xc00d32cc) +#define NS_E_TABLE_KEY_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d32cd) +#define NS_E_INVALID_QUERY_OPERATOR _HRESULT_TYPEDEF_(0xc00d32cf) +#define NS_E_INVALID_QUERY_PROPERTY _HRESULT_TYPEDEF_(0xc00d32d0) +#define NS_E_PROPERTY_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00d32d2) +#define NS_E_SCHEMA_CLASSIFY_FAILURE _HRESULT_TYPEDEF_(0xc00d32d4) +#define NS_E_METADATA_FORMAT_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00d32d5) +#define NS_E_METADATA_NO_EDITING_CAPABILITY _HRESULT_TYPEDEF_(0xc00d32d6) +#define NS_E_METADATA_CANNOT_SET_LOCALE _HRESULT_TYPEDEF_(0xc00d32d7) +#define NS_E_METADATA_LANGUAGE_NOT_SUPORTED _HRESULT_TYPEDEF_(0xc00d32d8) +#define NS_E_METADATA_NO_RFC1766_NAME_FOR_LOCALE _HRESULT_TYPEDEF_(0xc00d32d9) +#define NS_E_METADATA_NOT_AVAILABLE _HRESULT_TYPEDEF_(0xc00d32da) +#define NS_E_METADATA_CACHE_DATA_NOT_AVAILABLE _HRESULT_TYPEDEF_(0xc00d32db) +#define NS_E_METADATA_INVALID_DOCUMENT_TYPE _HRESULT_TYPEDEF_(0xc00d32dc) +#define NS_E_METADATA_IDENTIFIER_NOT_AVAILABLE _HRESULT_TYPEDEF_(0xc00d32dd) +#define NS_E_METADATA_CANNOT_RETRIEVE_FROM_OFFLINE_CACHE _HRESULT_TYPEDEF_(0xc00d32de) + +#endif /* _NSERROR_H */ diff --git a/sdk/include/psdk/wmdrmsdk.idl b/sdk/include/psdk/wmdrmsdk.idl new file mode 100644 index 0000000000..8de3b35aa5 --- /dev/null +++ b/sdk/include/psdk/wmdrmsdk.idl @@ -0,0 +1,81 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "mfobjects.idl"; +import "mfidl.idl"; + +typedef struct _DRM_MINIMUM_OUTPUT_PROTECTION_LEVELS +{ + WORD wCompressedDigitalVideo; + WORD wUncompressedDigitalVideo; + WORD wAnalogVideo; + WORD wCompressedDigitalAudio; + WORD wUncompressedDigitalAudio; +} DRM_MINIMUM_OUTPUT_PROTECTION_LEVELS; + +typedef struct _DRM_VIDEO_OUTPUT_PROTECTION +{ + GUID guidId; + BYTE bConfigData; +} DRM_VIDEO_OUTPUT_PROTECTION; + +typedef struct _DRM_VIDEO_OUTPUT_PROTECTION_IDS +{ + WORD cEntries; + DRM_VIDEO_OUTPUT_PROTECTION *rgVop; +} DRM_VIDEO_OUTPUT_PROTECTION_IDS; + +typedef struct _DRM_OPL_OUTPUT_IDS +{ + WORD cIds; + GUID *rgIds; +} DRM_OPL_OUTPUT_IDS; + +typedef struct __tagDRM_COPY_OPL +{ + WORD wMinimumCopyLevel; + DRM_OPL_OUTPUT_IDS oplIdIncludes; + DRM_OPL_OUTPUT_IDS oplIdExcludes; +} DRM_COPY_OPL; + +typedef struct __tagDRM_PLAY_OPL +{ + DRM_MINIMUM_OUTPUT_PROTECTION_LEVELS minOPL; + DRM_OPL_OUTPUT_IDS oplIdReserved; + DRM_VIDEO_OUTPUT_PROTECTION_IDS vopi; +} DRM_PLAY_OPL; + + +[ + uuid(82435be0-f7c1-4df9-8103-eeabebf3d6e1), + version(1.0) +] +library WMDRMContentEnablerLib +{ + importlib("stdole2.tlb"); + + [ + uuid(82435bdf-f7c1-4df9-8103-eeabebf3d6e1) + ] + coclass WMDRMContentEnablerActivate + { + [default] interface IPersistStream; + }; +}; diff --git a/sdk/include/psdk/wmsdk.h b/sdk/include/psdk/wmsdk.h new file mode 100644 index 0000000000..b5528a889b --- /dev/null +++ b/sdk/include/psdk/wmsdk.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2016 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Unlikely to ever be needed on Wine, currently unimplemented */ +/* #include <winapifamily.h> */ + +#include "wmsdkidl.h" + +/* Currently unimplemented */ +/* #include "asferr.h" */ +#include "nserror.h" diff --git a/sdk/include/psdk/wmsdkidl.idl b/sdk/include/psdk/wmsdkidl.idl index ddfd12bc42..e7daa226bc 100644 --- a/sdk/include/psdk/wmsdkidl.idl +++ b/sdk/include/psdk/wmsdkidl.idl @@ -18,7 +18,7 @@ import "oaidl.idl"; import "wmsbuffer.idl"; -/* import "drmexternals.idl"; */ +import "drmexternals.idl"; typedef unsigned __int64 QWORD; @@ -183,6 +183,42 @@ typedef enum tagWMT_OFFSET_FORMAT WMT_OFFSET_FORMAT_100NS_APPROXIMATE } WMT_OFFSET_FORMAT; +typedef enum WMT_CODEC_INFO_TYPE +{ + WMT_CODECINFO_AUDIO = 0, + WMT_CODECINFO_VIDEO = 1, + WMT_CODECINFO_UNKNOWN = 0xFFFFFFFF, +} WMT_CODEC_INFO_TYPE; + +typedef enum WMT_PROXY_SETTINGS +{ + WMT_PROXY_SETTING_NONE = 0, + WMT_PROXY_SETTING_MANUAL = 1, + WMT_PROXY_SETTING_AUTO = 2, + WMT_PROXY_SETTING_BROWSER = 3, + WMT_PROXY_SETTING_MAX +} WMT_PROXY_SETTINGS; + +typedef enum tagWMT_STORAGE_FORMAT +{ + WMT_Storage_Format_MP3 = 0, + WMT_Storage_Format_V1 = 1 +} WMT_STORAGE_FORMAT; + +#include <pshpack2.h> +typedef struct _WMStreamPrioritizationRecord +{ + WORD wStreamNumber; + BOOL fMandatory; +} WM_STREAM_PRIORITY_RECORD; +#include <poppack.h> + +typedef struct _WM_PORT_NUMBER_RANGE +{ + WORD wPortBegin; + WORD wPortEnd; +} WM_PORT_NUMBER_RANGE; + typedef LPCWSTR LPCWSTR_WMSDK_TYPE_SAFE; [ @@ -246,6 +282,43 @@ interface IWMMutualExclusion : IWMStreamList HRESULT SetType([in] REFGUID guidType); } +[ + object, + uuid(ad694af1-f8d9-42f8-bc47-70311b0c4f9e), + pointer_default(unique), + local +] +interface IWMBandwidthSharing : IWMStreamList +{ + HRESULT GetType([out] GUID *guid); + HRESULT SetType([in] REFGUID guid); + + HRESULT GetBandwidth( + [out] DWORD *bitrate, + [out] DWORD *buffer); + + HRESULT SetBandwidth( + [in] DWORD bitrate, + [in] DWORD buffer); +}; + +[ + object, + uuid(8c1c6090-f9a8-4748-8ec3-dd1108ba1e77), + pointer_default(unique), + local +] +interface IWMStreamPrioritization : IUnknown +{ + HRESULT GetPriorityRecords( + [out] WM_STREAM_PRIORITY_RECORD *array, + [in, out] WORD *records); + + HRESULT SetPriorityRecords( + [in] WM_STREAM_PRIORITY_RECORD *array, + [in] WORD records); +} + [ object, uuid(96406Bdc-2b2b-11d3-b36b-00c04f6108ff), @@ -344,6 +417,53 @@ interface IWMProfile : IUnknown [out] IWMMutualExclusion **ppME); } +[ + object, + uuid(07e72d33-d94e-4be7-8843-60ae5ff7e5f5), + pointer_default(unique), + local +] +interface IWMProfile2 : IWMProfile +{ + HRESULT GetProfileID([out] GUID *guid); +} + +[ + object, + uuid(00ef96cc-a461-4546-8bcd-c9a28f0e06f5), + pointer_default(unique), + local +] +interface IWMProfile3 : IWMProfile2 +{ + HRESULT GetStorageFormat([out] WMT_STORAGE_FORMAT *storage); + HRESULT SetStorageFormat([in] WMT_STORAGE_FORMAT storage); + + HRESULT GetBandwidthSharingCount([out] DWORD *count); + + HRESULT GetBandwidthSharing( + [in] DWORD index, + [out] IWMBandwidthSharing **bandwidth); + + HRESULT RemoveBandwidthSharing([in] IWMBandwidthSharing *bandwidth); + + HRESULT AddBandwidthSharing([in] IWMBandwidthSharing *bandwidth); + + HRESULT CreateNewBandwidthSharing([out] IWMBandwidthSharing **bandwidth); + + HRESULT GetStreamPrioritization([out] IWMStreamPrioritization **stream); + + HRESULT SetStreamPrioritization([in] IWMStreamPrioritization *stream); + + HRESULT RemoveStreamPrioritization(); + + HRESULT CreateNewStreamPrioritization([out] IWMStreamPrioritization **stream); + + HRESULT GetExpectedPacketCount( + [in] QWORD duration, + [out] QWORD *packets); +}; + [ object, uuid(d16679f2-6ca0-472d-8d31-2f5d55aee155), @@ -549,7 +669,7 @@ interface IWMReaderAdvanced : IUnknown [in] BOOL fAllocate); HRESULT GetAllocateForStream( - [in] WORD dwSreamNum, + [in] WORD dwStreamNum, [out] BOOL *pfAllocate); HRESULT GetStatistics( @@ -1016,6 +1136,488 @@ interface IWMWriterAdvanced3 : IWMWriterAdvanced2 HRESULT SetNonBlocking(); } +[ + object, + uuid(96406bda-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMHeaderInfo : IUnknown +{ + HRESULT GetAttributeCount( + [in] WORD stream_num, + [out] WORD *attributes ); + + HRESULT GetAttributeByIndex( + [in] WORD index, + [in, out] WORD *stream_num, + [out, size_is( *name_len )] WCHAR *name, + [in, out] WORD *name_len, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length ); + + HRESULT GetAttributeByName( + [in, out] WORD *stream_num, + [in] LPCWSTR name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length ); + + HRESULT SetAttribute( + [in] WORD stream_num, + [in] LPCWSTR name, + [in] WMT_ATTR_DATATYPE type, + [in, size_is( length )] const BYTE *value, + [in] WORD length ); + + HRESULT GetMarkerCount( + [out] WORD *markers ); + + HRESULT GetMarker( + [in] WORD index, + [out, size_is( *marker_len )] WCHAR *marker_name, + [in, out] WORD *marker_len, + [out] QWORD *marker_time ); + + HRESULT AddMarker( + [in] LPCWSTR_WMSDK_TYPE_SAFE marker_name, + [in] QWORD marker_time ); + + HRESULT RemoveMarker( + [in] WORD index ); + + HRESULT GetScriptCount( + [out] WORD *scripts ); + + HRESULT GetScript( + [in] WORD index, + [out, size_is( *type_len )] WCHAR *type, + [in, out] WORD *type_len, + [out, size_is( *command_len )] WCHAR *command, + [in, out] WORD *command_len, + [out] QWORD *script_time ); + + HRESULT AddScript( + [in] LPCWSTR_WMSDK_TYPE_SAFE type, + [in] LPCWSTR_WMSDK_TYPE_SAFE command, + [in] QWORD script_time ); + + HRESULT RemoveScript( + [in] WORD index ); +}; + +[ + object, + uuid(15cf9781-454e-482e-b393-85fae487a810), + pointer_default(unique), + local +] +interface IWMHeaderInfo2 : IWMHeaderInfo +{ + HRESULT GetCodecInfoCount( + [out] DWORD *codec_infos ); + + HRESULT GetCodecInfo( + [in] DWORD index, + [in, out] WORD *name_len, + [out, size_is( *name_len )] WCHAR *name, + [in, out] WORD *description_len, + [out, size_is( *description_len )] WCHAR *description, + [out] WMT_CODEC_INFO_TYPE *codec_type, + [in, out] WORD *codec_info_cnt, + [out, size_is( *codec_info_cnt )] BYTE *codec_info ); +}; + +[ + object, + uuid(15cc68e3-27cc-4ecd-b222-3f5d02d80bd5), + pointer_default(unique), + local +] +interface IWMHeaderInfo3 : IWMHeaderInfo2 +{ + HRESULT GetAttributeCountEx( + [in] WORD stream_num, + [out] WORD *attributes ); + + HRESULT GetAttributeIndices( + [in] WORD stream_num, + [in] LPCWSTR name, + [in] WORD *lang_index, + [out, size_is( *count )] WORD *indices, + [in, out] WORD *count ); + + HRESULT GetAttributeByIndexEx( + [in] WORD stream_num, + [in] WORD index, + [out, size_is( *name_len )] LPWSTR name, + [in, out] WORD *name_len, + [out] WMT_ATTR_DATATYPE *type, + [out] WORD *lang_index, + [out, size_is( *data_len )] BYTE *value, + [in, out] DWORD *data_len ); + + HRESULT ModifyAttribute( + [in] WORD stream_num, + [in] WORD index, + [in] WMT_ATTR_DATATYPE type, + [in] WORD lang_index, + [in, size_is( length )] const BYTE *value, + [in] DWORD length ); + + HRESULT AddAttribute( + [in] WORD stream_num, + [in] LPCWSTR name, + [out] WORD *index, + [in] WMT_ATTR_DATATYPE type, + [in] WORD lang_index, + [in, size_is( length )] const BYTE *value, + [in] DWORD length ); + + HRESULT DeleteAttribute( + [in] WORD stream_num, + [in] WORD index ); + + HRESULT AddCodecInfo( + [in] LPCWSTR_WMSDK_TYPE_SAFE name, + [in] LPCWSTR_WMSDK_TYPE_SAFE description, + [in] WMT_CODEC_INFO_TYPE codec_type, + [in] WORD codec_info_cnt, + [in, size_is( codec_info_cnt )] BYTE *codec_info ); +}; + +[ + object, + uuid(96406bec-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMReaderNetworkConfig : IUnknown +{ + HRESULT GetBufferingTime([out] QWORD *buffering_time); + HRESULT SetBufferingTime([in] QWORD buffering_time); + + HRESULT GetUDPPortRanges( + [out, size_is( *ranges )] WM_PORT_NUMBER_RANGE *array, + [in, out] DWORD *ranges); + + HRESULT SetUDPPortRanges( + [in, size_is( ranges )] WM_PORT_NUMBER_RANGE *array, + [in] DWORD ranges); + + HRESULT GetProxySettings( + [in] const WCHAR *protocol, + [out] WMT_PROXY_SETTINGS *proxy); + + HRESULT SetProxySettings( + [in] LPCWSTR protocol, + [in] WMT_PROXY_SETTINGS proxy); + + HRESULT GetProxyHostName( + [in] const WCHAR *protocol, + [out, size_is( *size )] WCHAR *hostname, + [in, out] DWORD *size); + + HRESULT SetProxyHostName( + [in] const WCHAR *protocol, + [in] const WCHAR *hostname); + + HRESULT GetProxyPort( + [in] const WCHAR *protocol, + [out] DWORD *port); + + HRESULT SetProxyPort( + [in] const WCHAR *protocol, + [in] DWORD port); + + HRESULT GetProxyExceptionList( + [in] const WCHAR *protocol, + [out, size_is( *count )] WCHAR *exceptions, + [in, out] DWORD *count); + + HRESULT SetProxyExceptionList( + [in] const WCHAR *protocol, + [in] const WCHAR *exceptions); + + HRESULT GetProxyBypassForLocal( + [in] const WCHAR *protocol, + [out] BOOL *bypass); + + HRESULT SetProxyBypassForLocal( + [in] const WCHAR *protocol, + [in] BOOL bypass); + + HRESULT GetForceRerunAutoProxyDetection([out] BOOL *detection); + HRESULT SetForceRerunAutoProxyDetection([in] BOOL detection); + + HRESULT GetEnableMulticast([out] BOOL *multicast); + HRESULT SetEnableMulticast([in] BOOL multicast); + + HRESULT GetEnableHTTP([out] BOOL *enable); + HRESULT SetEnableHTTP([in] BOOL enable); + + HRESULT GetEnableUDP([out] BOOL *enable); + HRESULT SetEnableUDP([in] BOOL enable); + + HRESULT GetEnableTCP([out] BOOL *enable); + HRESULT SetEnableTCP([in] BOOL enable); + + HRESULT ResetProtocolRollover(); + + HRESULT GetConnectionBandwidth([out] DWORD *bandwidth); + HRESULT SetConnectionBandwidth([in] DWORD bandwidth); + + HRESULT GetNumProtocolsSupported([out] DWORD *protocols); + + HRESULT GetSupportedProtocolName( + [in] DWORD protocol_num, + [out, size_is( *size )] WCHAR *protocol, + [in, out] DWORD *size); + + HRESULT AddLoggingUrl([in] const WCHAR *url); + + HRESULT GetLoggingUrl( + [in] DWORD index, + [out, size_is( *size )] WCHAR *url, + [in, out] DWORD *size); + + HRESULT GetLoggingUrlCount([out] DWORD *count); + + HRESULT ResetLoggingUrlList(); +} + +[ + object, + uuid(d979a853-042b-4050-8387-c939db22013f), + pointer_default(unique), + local +] +interface IWMReaderNetworkConfig2 : IWMReaderNetworkConfig +{ + HRESULT GetEnableContentCaching([out] BOOL *enable); + HRESULT SetEnableContentCaching([in] BOOL enable); + + HRESULT GetEnableFastCache([out] BOOL *enable); + HRESULT SetEnableFastCache([in] BOOL enable); + + HRESULT GetAcceleratedStreamingDuration([out] QWORD *duration); + HRESULT SetAcceleratedStreamingDuration([in] QWORD duration); + + HRESULT GetAutoReconnectLimit([out] DWORD *limit); + HRESULT SetAutoReconnectLimit([in] DWORD limit); + + HRESULT GetEnableResends([out] BOOL *enable); + HRESULT SetEnableResends([in] BOOL enable); + + HRESULT GetEnableThinning([out] BOOL *enable); + HRESULT SetEnableThinning([in] BOOL enable); + + HRESULT GetMaxNetPacketSize([out] DWORD *packet_size); +} + +[ + object, + uuid(96406bed-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] + +interface IWMReaderStreamClock : IUnknown +{ + HRESULT GetTime([in] QWORD *now); + + HRESULT SetTimer([in] QWORD when, + [in] void *param, + [out] DWORD *id); + + HRESULT KillTimer([in] DWORD id); +} + +[ + object, + uuid(cdfb97ab-188f-40b3-b643-5b7903975c59), + pointer_default(unique), + local +] +interface IWMPacketSize : IUnknown +{ + HRESULT GetMaxPacketSize([out] DWORD *size); + HRESULT SetMaxPacketSize([in] DWORD size); +}; + +[ + object, + uuid(8bfc2b9e-b646-4233-a877-1c6a079669dc), + pointer_default(unique), + local +] +interface IWMPacketSize2 : IWMPacketSize +{ + HRESULT GetMinPacketSize([out] DWORD *size); + HRESULT SetMinPacketSize([in] DWORD size); +}; + +[ + object, + uuid(d2827540-3ee7-432c-b14c-dc17f085d3b3), + pointer_default(unique), + local +] +interface IWMDRMReader : IUnknown +{ + HRESULT AcquireLicense([in] DWORD flags); + HRESULT CancelLicenseAcquisition(); + + HRESULT Individualize([in] DWORD flags); + HRESULT CancelIndividualization(); + + HRESULT MonitorLicenseAcquisition(); + HRESULT CancelMonitorLicenseAcquisition(); + + HRESULT SetDRMProperty( + [in] const WCHAR *name, + [in] WMT_ATTR_DATATYPE type, + [in, size_is( length )] const BYTE *value, + [in] WORD length); + + HRESULT GetDRMProperty( + [in] const WCHAR *name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length); +}; + +[ + object, + uuid(befe7a75-9f1d-4075-b9d9-a3c37bda49a0), + pointer_default(unique), + local +] +interface IWMDRMReader2 : IWMDRMReader +{ + HRESULT SetEvaluateOutputLevelLicenses([in] BOOL evaluate); + HRESULT GetPlayOutputLevels( + [out, size_is( *length )] DRM_PLAY_OPL *play, + [in, out] DWORD *length, + [out] DWORD *level); + + HRESULT GetCopyOutputLevels( + [out, size_is( *length )] DRM_COPY_OPL *copy, + [in, out] DWORD *length, + [out] DWORD *level); + + HRESULT TryNextLicense(); +}; + +[ + object, + uuid(e08672de-f1e7-4ff4-a0a3-fc4b08e4caf8), + pointer_default(unique), + local +] +interface IWMDRMReader3 : IWMDRMReader2 +{ + HRESULT GetInclusionList( + [out] GUID **guids, + [out] DWORD *count); +}; + +[ + object, + uuid(bddc4d08-944d-4d52-a612-46c3fda07dd4), + pointer_default( unique ), + local +] +interface IWMReaderAccelerator : IUnknown +{ + HRESULT GetCodecInterface( + [in] DWORD output, + [in] REFIID riid, + [out] void **codec); + + HRESULT Notify( + [in] DWORD output, + [in] WM_MEDIA_TYPE *subtype); +}; + +[ + object, + uuid(f369e2f0-e081-4fe6-8450-b810b2f410d1), + pointer_default(unique), + local +] +interface IWMReaderTimecode : IUnknown +{ + HRESULT GetTimecodeRangeCount( + [in] WORD num, + [out] WORD *count); + + HRESULT GetTimecodeRangeBounds( + [in] WORD stream, + [in] WORD range, + [out] DWORD *start_timecode, + [out] DWORD *end_timecode); +}; + +[ + object, + uuid(fdbe5592-81a1-41ea-93bd-735cad1adc05), + pointer_default(unique), + local +] +interface IWMReaderTypeNegotiation : IUnknown +{ + HRESULT TryOutputProps( + [in] DWORD output, + [in] IWMOutputMediaProps *props); +}; + +[ + object, + uuid(df683f00-2d49-4d8e-92b7-fb19f6a0dc57), + pointer_default(unique), + local +] +interface IWMLanguageList : IUnknown +{ + HRESULT GetLanguageCount( + [out] WORD *count); + + HRESULT GetLanguageDetails( + [in] WORD index, + [out, size_is( *length )] WCHAR *language, + [in, out] WORD *length); + + HRESULT AddLanguageByRFC1766String( + [in] LPCWSTR_WMSDK_TYPE_SAFE language, + [out] WORD *index); +}; + +[ + object, + uuid(f28c0300-9baa-4477-a846-1744d9cbf533), + pointer_default(unique), + local +] +interface IWMReaderPlaylistBurn : IUnknown +{ + HRESULT InitPlaylistBurn( + [in] DWORD count, + [in] LPCWSTR_WMSDK_TYPE_SAFE *filenames, + [in] IWMStatusCallback *callback, + [in] void *context); + + HRESULT GetInitResults( + [in] DWORD count, + [out] HRESULT *stat); + + HRESULT Cancel(); + + HRESULT EndPlaylistBurn([in] HRESULT result); +}; + + cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);")

1 0

[reactos] 01/04: [PSDK] Update mmreg.h and rpcndr.h. CORE-13762
by Amine Khaldi 08 Oct '17

08 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc0774d8d0e3bd3633eb6… commit dc0774d8d0e3bd3633eb68215020e7d7c5dc0bff Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 8 10:25:17 2017 +0100 [PSDK] Update mmreg.h and rpcndr.h. CORE-13762 --- sdk/include/psdk/mmreg.h | 36 ++++++++++++++++++++++++++++++++++++ sdk/include/psdk/rpcndr.h | 12 ++++++++++++ 2 files changed, 48 insertions(+) diff --git a/sdk/include/psdk/mmreg.h b/sdk/include/psdk/mmreg.h index e0f886f8d1..c6f6b56033 100644 --- a/sdk/include/psdk/mmreg.h +++ b/sdk/include/psdk/mmreg.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WIDL__ + #ifndef __WINE_MMREG_H #define __WINE_MMREG_H @@ -537,3 +539,37 @@ typedef struct tagEXBMINFOHEADER { #endif #endif /* __WINE_MMREG_H */ + +#else /* __WIDL__ */ + +cpp_quote("#if 0") +#pragma pack(push, 1) + +typedef struct tWAVEFORMATEX { + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; + WORD wBitsPerSample; + WORD cbSize; + [size_is(cbSize)] BYTE pExtraBytes[]; +} WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; + +typedef struct { + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; + WORD wBitsPerSample; + WORD cbSize; + WORD wValidBitsPerSample; + DWORD dwChannelMask; + GUID SubFormat; +} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; + +#pragma pack(pop) +cpp_quote("#endif") + +#endif /* __WIDL__ */ diff --git a/sdk/include/psdk/rpcndr.h b/sdk/include/psdk/rpcndr.h index 52f419bef6..bc06335c67 100644 --- a/sdk/include/psdk/rpcndr.h +++ b/sdk/include/psdk/rpcndr.h @@ -42,6 +42,18 @@ extern "C" { # define CONST_VTBL #endif +#ifndef EXTERN_GUID +#ifdef __cplusplus +#define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \ + EXTERN_C const GUID DECLSPEC_SELECTANY name = \ + { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } +#else +#define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const GUID name +#endif +#endif + /* stupid #if can't handle casts... this __stupidity is just a workaround for that limitation */

1 0

[reactos] 01/01: [D3DX9_24 => 43] Sync with Wine Staging 2.16. CORE-13762
by Amine Khaldi 08 Oct '17

08 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85d9a38ac0413ee49f23b… commit 85d9a38ac0413ee49f23b033ad263676691386ba Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 8 09:25:43 2017 +0100 [D3DX9_24 => 43] Sync with Wine Staging 2.16. CORE-13762 --- dll/directx/wine/d3dx9_24/d3dx9_24.spec | 36 +- dll/directx/wine/d3dx9_25/d3dx9_25.spec | 36 +- dll/directx/wine/d3dx9_26/d3dx9_26.spec | 36 +- dll/directx/wine/d3dx9_27/d3dx9_27.spec | 36 +- dll/directx/wine/d3dx9_28/d3dx9_28.spec | 36 +- dll/directx/wine/d3dx9_29/d3dx9_29.spec | 36 +- dll/directx/wine/d3dx9_30/d3dx9_30.spec | 38 +- dll/directx/wine/d3dx9_31/d3dx9_31.spec | 36 +- dll/directx/wine/d3dx9_32/d3dx9_32.spec | 46 +- dll/directx/wine/d3dx9_33/d3dx9_33.spec | 46 +- dll/directx/wine/d3dx9_34/d3dx9_34.spec | 46 +- dll/directx/wine/d3dx9_35/d3dx9_35.spec | 46 +- dll/directx/wine/d3dx9_36/CMakeLists.txt | 3 +- dll/directx/wine/d3dx9_36/d3dx9_36.spec | 60 +- dll/directx/wine/d3dx9_36/d3dx9_36_main.c | 18 - dll/directx/wine/d3dx9_36/d3dx9_36_private.h | 282 +++- dll/directx/wine/d3dx9_36/effect.c | 1797 +++++++++++++++++++++----- dll/directx/wine/d3dx9_36/math.c | 68 +- dll/directx/wine/d3dx9_36/mesh.c | 54 +- dll/directx/wine/d3dx9_36/preshader.c | 1764 +++++++++++++++++++++++++ dll/directx/wine/d3dx9_36/shader.c | 603 ++++----- dll/directx/wine/d3dx9_36/sprite.c | 10 +- dll/directx/wine/d3dx9_36/surface.c | 43 +- dll/directx/wine/d3dx9_36/texture.c | 20 +- dll/directx/wine/d3dx9_36/util.c | 95 +- dll/directx/wine/d3dx9_36/volume.c | 18 +- dll/directx/wine/d3dx9_37/d3dx9_37.spec | 48 +- dll/directx/wine/d3dx9_38/d3dx9_38.spec | 48 +- dll/directx/wine/d3dx9_39/d3dx9_39.spec | 48 +- dll/directx/wine/d3dx9_40/d3dx9_40.spec | 48 +- dll/directx/wine/d3dx9_41/d3dx9_41.spec | 48 +- dll/directx/wine/d3dx9_42/d3dx9_42.spec | 53 +- dll/directx/wine/d3dx9_43/d3dx9_43.spec | 46 +- media/doc/README.WINE | 2 +- 34 files changed, 4445 insertions(+), 1205 deletions(-) diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec index a87070737d..2514f794ac 100644 --- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec +++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec @@ -71,18 +71,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF @ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh @ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream -@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer @ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex @ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer @ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface @ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh @ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo -@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) d3dx9_36.D3DXCreateSphere @ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite @ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot @@ -117,6 +117,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF @ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_25.D3DXDisassembleEffect # don't forward @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture @ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX @@ -135,7 +136,6 @@ @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm -@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments @ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA @ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW @@ -173,11 +173,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW -@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA @ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW @ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA @ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory @@ -247,6 +247,19 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle @ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize +@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd +@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot +@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight +@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection +@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight +@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight +@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight +@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC +@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap +@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate +@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ +@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA @ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW @ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA @@ -264,19 +277,6 @@ @ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA @ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory @ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW -@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd -@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot -@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight -@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection -@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight -@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight -@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight -@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap -@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC -@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster -@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate -@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ -@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec index 46b9de736c..2157a82db5 100644 --- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec +++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec @@ -71,18 +71,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF @ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh @ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream -@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer @ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex @ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer @ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface @ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh @ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo -@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) d3dx9_36.D3DXCreateSphere @ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite @ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot @@ -117,6 +117,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF @ stdcall D3DXDisassembleEffect(ptr long ptr) D3DXDisassembleEffect25 @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture @ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX @@ -135,7 +136,6 @@ @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm -@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments @ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA @ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW @@ -173,11 +173,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW -@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA @ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW @ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA @ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory @@ -247,6 +247,19 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle @ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize +@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd +@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot +@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight +@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection +@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight +@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight +@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight +@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC +@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap +@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate +@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ +@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA @ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW @ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA @@ -264,19 +277,6 @@ @ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA @ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory @ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW -@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd -@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot -@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight -@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection -@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight -@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight -@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight -@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap -@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC -@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster -@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate -@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ -@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec index e6a21967d5..dd9423c8c7 100644 --- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec +++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF @ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh @ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream -@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer @ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex @ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer @ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface @ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh @ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo -@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) d3dx9_36.D3DXCreateSphere @ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite @ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF @ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_36.D3DXDisassembleEffect @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture @ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX @@ -139,7 +140,6 @@ @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm -@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments @ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA @ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW @@ -177,11 +177,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW -@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA @ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW @ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA @ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory @@ -251,6 +251,19 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle @ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize +@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd +@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot +@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight +@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection +@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight +@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight +@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight +@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC +@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap +@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate +@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ +@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA @ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW @ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA @@ -268,19 +281,6 @@ @ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA @ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory @ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW -@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd -@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot -@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight -@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection -@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight -@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight -@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight -@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap -@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC -@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster -@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate -@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ -@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec index e6a21967d5..dd9423c8c7 100644 --- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec +++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF @ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh @ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream -@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer @ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex @ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer @ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface @ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh @ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo -@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) d3dx9_36.D3DXCreateSphere @ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite @ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF @ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_36.D3DXDisassembleEffect @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture @ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX @@ -139,7 +140,6 @@ @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm -@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments @ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA @ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW @@ -177,11 +177,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW -@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA @ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW @ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA @ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory @@ -251,6 +251,19 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle @ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize +@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd +@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot +@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight +@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection +@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight +@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight +@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight +@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC +@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap +@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate +@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ +@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA @ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW @ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA @@ -268,19 +281,6 @@ @ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA @ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory @ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW -@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd -@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot -@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight -@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection -@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight -@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight -@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight -@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap -@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC -@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster -@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate -@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ -@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec index b1ae88e8da..7e53b00c1f 100644 --- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec +++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF @ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh @ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream -@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer @ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex @ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer @ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface @ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh @ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo -@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) d3dx9_36.D3DXCreateSphere @ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite @ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF @ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_36.D3DXDisassembleEffect @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture @ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX @@ -139,7 +140,6 @@ @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm -@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments @ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA @ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW @@ -177,11 +177,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW -@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA @ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW @ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA @ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory @@ -256,6 +256,19 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle @ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize +@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd +@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot +@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight +@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection +@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight +@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight +@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight +@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC +@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap +@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate +@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ +@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA @ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW @ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA @@ -273,19 +286,6 @@ @ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA @ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory @ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW -@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd -@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot -@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight -@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection -@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight -@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight -@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight -@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap -@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC -@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster -@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate -@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ -@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec index b1ae88e8da..7e53b00c1f 100644 --- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec +++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF @ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh @ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream -@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer @ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex @ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer @ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface @ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh @ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo -@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) d3dx9_36.D3DXCreateSphere @ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite @ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF @ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_36.D3DXDisassembleEffect @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture @ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX @@ -139,7 +140,6 @@ @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm -@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments @ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA @ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW @@ -177,11 +177,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW -@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA @ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW @ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA @ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory @@ -256,6 +256,19 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle @ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize +@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd +@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot +@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight +@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection +@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight +@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight +@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight +@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC +@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap +@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate +@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ +@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA @ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW @ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA @@ -273,19 +286,6 @@ @ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA @ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory @ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW -@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd -@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot -@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight -@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection -@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight -@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight -@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight -@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap -@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC -@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster -@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate -@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ -@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec index c2035e2834..36a4e120ad 100644 --- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec +++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec @@ -18,8 +18,8 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) d3dx9_36.D3DXCompileShaderFromResourceW @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingSphere -@ stdcall D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerVertexSignal @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal +@ stdcall D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerVertexSignal @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF @ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh @ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream -@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer @ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex @ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer @ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface @ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh @ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo -@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) d3dx9_36.D3DXCreateSphere @ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite @ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF @ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_36.D3DXDisassembleEffect @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture @ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX @@ -139,7 +140,6 @@ @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm -@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments @ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA @ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW @@ -177,11 +177,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW -@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA @ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW @ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA @ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory @@ -256,6 +256,19 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle @ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize +@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd +@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot +@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight +@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection +@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight +@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight +@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight +@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC +@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap +@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate +@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ +@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA @ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW @ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA @@ -273,19 +286,6 @@ @ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA @ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory @ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW -@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd -@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot -@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight -@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection -@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight -@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight -@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight -@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap -@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC -@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster -@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate -@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ -@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec index 0c5976e62f..ebb7da30f6 100644 --- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec +++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec @@ -74,18 +74,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF @ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh @ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream -@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer @ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex @ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer @ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface @ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh @ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo -@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) d3dx9_36.D3DXCreateSphere @ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite @ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot @@ -120,6 +120,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF @ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_36.D3DXDisassembleEffect @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture @ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX @@ -138,7 +139,6 @@ @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm -@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments @ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA @ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW @@ -174,11 +174,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW -@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA @ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW @ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA @ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory @@ -253,6 +253,19 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle @ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize +@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd +@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot +@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight +@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection +@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight +@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight +@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight +@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC +@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap +@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate +@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ +@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA @ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW @ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA @@ -270,19 +283,6 @@ @ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA @ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory @ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW -@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd -@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot -@ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight -@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection -@ stdcall D3DXSHEvalDirectionalLight(long ptr float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight -@ stdcall D3DXSHEvalHemisphereLight(long ptr int128 int128 ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight -@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight -@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap -@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC -@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster -@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate -@ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ -@ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec index 35cb0b678c..9540de3c7d 100644 --- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec +++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec @@ -74,18 +74,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF @ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh @ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream -@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer @ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex @ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer @ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface @ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh @ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo -@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) d3dx9_36.D3DXCreateSphere @ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite @ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot @@ -120,6 +120,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF @ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_36.D3DXDisassembleEffect @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture @ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX @@ -138,7 +139,6 @@ @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm -@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments @ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA @ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW @@ -174,11 +174,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW -@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA @ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW @ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA @ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory @@ -253,23 +253,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle @ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize -@ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA -@ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW -@ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA -@ stdcall D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXW -@ stdcall D3DXSavePRTBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileA -@ stdcall D3DXSavePRTBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileW -@ stdcall D3DXSavePRTCompBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileA -@ stdcall D3DXSavePRTCompBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileW -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileA -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileInMemory -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileW -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileA -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileInMemory -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileW -@ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA -@ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory -@ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW @ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd @ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight @@ -282,12 +265,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) d3dx9_36.D3DXSHMultiply4 @ stdcall D3DXSHMultiply5(ptr ptr ptr) d3dx9_36.D3DXSHMultiply5 @ stdcall D3DXSHMultiply6(ptr ptr ptr) d3dx9_36.D3DXSHMultiply6 -@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap @ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC @ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap @ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate @ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ @ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale +@ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA +@ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW +@ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA +@ stdcall D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXW +@ stdcall D3DXSavePRTBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileA +@ stdcall D3DXSavePRTBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileW +@ stdcall D3DXSavePRTCompBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileA +@ stdcall D3DXSavePRTCompBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileW +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileA +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileInMemory +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileW +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileA +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileInMemory +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileW +@ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA +@ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory +@ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec index b93865b630..4bcabd9814 100644 --- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec +++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec @@ -74,18 +74,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF @ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh @ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream -@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer @ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex @ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer @ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface @ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh @ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo -@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) d3dx9_36.D3DXCreateSphere @ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite @ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot @@ -120,6 +120,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF @ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_36.D3DXDisassembleEffect @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture @ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX @@ -138,7 +139,6 @@ @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm -@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments @ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA @ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW @@ -174,11 +174,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW -@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA @ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW @ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA @ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory @@ -253,23 +253,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle @ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize -@ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA -@ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW -@ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA -@ stdcall D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXW -@ stdcall D3DXSavePRTBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileA -@ stdcall D3DXSavePRTBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileW -@ stdcall D3DXSavePRTCompBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileA -@ stdcall D3DXSavePRTCompBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileW -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileA -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileInMemory -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileW -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileA -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileInMemory -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileW -@ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA -@ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory -@ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW @ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd @ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight @@ -282,12 +265,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) d3dx9_36.D3DXSHMultiply4 @ stdcall D3DXSHMultiply5(ptr ptr ptr) d3dx9_36.D3DXSHMultiply5 @ stdcall D3DXSHMultiply6(ptr ptr ptr) d3dx9_36.D3DXSHMultiply6 -@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap @ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC @ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap @ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate @ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ @ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale +@ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA +@ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW +@ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA +@ stdcall D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXW +@ stdcall D3DXSavePRTBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileA +@ stdcall D3DXSavePRTBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileW +@ stdcall D3DXSavePRTCompBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileA +@ stdcall D3DXSavePRTCompBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileW +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileA +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileInMemory +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileW +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileA +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileInMemory +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileW +@ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA +@ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory +@ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec index 35cb0b678c..9540de3c7d 100644 --- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec +++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec @@ -74,18 +74,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF @ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh @ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream -@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer @ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex @ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer @ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface @ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh @ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo -@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) d3dx9_36.D3DXCreateSphere @ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite @ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot @@ -120,6 +120,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF @ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_36.D3DXDisassembleEffect @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture @ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX @@ -138,7 +139,6 @@ @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm -@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments @ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA @ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW @@ -174,11 +174,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW -@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA @ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW @ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA @ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory @@ -253,23 +253,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle @ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize -@ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA -@ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW -@ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA -@ stdcall D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXW -@ stdcall D3DXSavePRTBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileA -@ stdcall D3DXSavePRTBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileW -@ stdcall D3DXSavePRTCompBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileA -@ stdcall D3DXSavePRTCompBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileW -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileA -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileInMemory -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileW -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileA -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileInMemory -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileW -@ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA -@ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory -@ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW @ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd @ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight @@ -282,12 +265,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) d3dx9_36.D3DXSHMultiply4 @ stdcall D3DXSHMultiply5(ptr ptr ptr) d3dx9_36.D3DXSHMultiply5 @ stdcall D3DXSHMultiply6(ptr ptr ptr) d3dx9_36.D3DXSHMultiply6 -@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap @ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC @ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap @ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate @ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ @ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale +@ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA +@ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW +@ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA +@ stdcall D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXW +@ stdcall D3DXSavePRTBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileA +@ stdcall D3DXSavePRTBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileW +@ stdcall D3DXSavePRTCompBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileA +@ stdcall D3DXSavePRTCompBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileW +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileA +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileInMemory +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileW +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileA +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileInMemory +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileW +@ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA +@ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory +@ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec index 35cb0b678c..9540de3c7d 100644 --- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec +++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec @@ -74,18 +74,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF @ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh @ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream -@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer @ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex @ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer @ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) d3dx9_36.D3DXCreatePolygon @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface @ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh @ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo -@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) d3dx9_36.D3DXCreateSphere @ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite @ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot @@ -120,6 +120,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF @ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_36.D3DXDisassembleEffect @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture @ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX @@ -138,7 +139,6 @@ @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm -@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator @ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments @ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA @ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW @@ -174,11 +174,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW -@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA @ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW @ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA @ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory @@ -253,23 +253,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle @ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize -@ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA -@ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW -@ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA -@ stdcall D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXW -@ stdcall D3DXSavePRTBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileA -@ stdcall D3DXSavePRTBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileW -@ stdcall D3DXSavePRTCompBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileA -@ stdcall D3DXSavePRTCompBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileW -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileA -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileInMemory -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileW -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileA -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileInMemory -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileW -@ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA -@ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory -@ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW @ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd @ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight @@ -282,12 +265,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) d3dx9_36.D3DXSHMultiply4 @ stdcall D3DXSHMultiply5(ptr ptr ptr) d3dx9_36.D3DXSHMultiply5 @ stdcall D3DXSHMultiply6(ptr ptr ptr) d3dx9_36.D3DXSHMultiply6 -@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap @ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC @ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap @ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate @ stdcall D3DXSHRotateZ(ptr long float ptr) d3dx9_36.D3DXSHRotateZ @ stdcall D3DXSHScale(ptr long ptr float) d3dx9_36.D3DXSHScale +@ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA +@ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW +@ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA +@ stdcall D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXW +@ stdcall D3DXSavePRTBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileA +@ stdcall D3DXSavePRTBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileW +@ stdcall D3DXSavePRTCompBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileA +@ stdcall D3DXSavePRTCompBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileW +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileA +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileInMemory +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileW +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileA +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileInMemory +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileW +@ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA +@ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory +@ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW @ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) d3dx9_36.D3DXSphereBoundProbe @ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh diff --git a/dll/directx/wine/d3dx9_36/CMakeLists.txt b/dll/directx/wine/d3dx9_36/CMakeLists.txt index 05f9873ad6..1b56e547d4 100644 --- a/dll/directx/wine/d3dx9_36/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_36/CMakeLists.txt @@ -1,5 +1,5 @@ -add_definitions(-D__WINESRC__ -Dcopysignf=_copysignf) +add_definitions(-D__WINESRC__ -Dcopysignf=_copysignf -D_D3DX9_VER=36) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB) @@ -12,6 +12,7 @@ list(APPEND SOURCE line.c math.c mesh.c + preshader.c render.c shader.c skin.c diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec index 00c5a5abfb..e073d6e537 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec +++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec @@ -18,13 +18,13 @@ @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) @ stdcall -stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) +@ stdcall -stub D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) @ stdcall -stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @@ -55,11 +55,11 @@ @ stdcall D3DXCreateEffectEx(ptr ptr long ptr ptr str long ptr ptr ptr) @ stdcall D3DXCreateEffectFromFileA(ptr str ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectFromFileExA(ptr str ptr ptr str long ptr ptr ptr) -@ stdcall D3DXCreateEffectFromFileExW(ptr str ptr ptr str long ptr ptr ptr) +@ stdcall D3DXCreateEffectFromFileExW(ptr wstr ptr ptr str long ptr ptr ptr) @ stdcall D3DXCreateEffectFromFileW(ptr wstr ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectFromResourceA(ptr long str ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectFromResourceExA(ptr long str ptr ptr str long ptr ptr ptr) -@ stdcall D3DXCreateEffectFromResourceExW(ptr long str ptr ptr str long ptr ptr ptr) +@ stdcall D3DXCreateEffectFromResourceExW(ptr long wstr ptr ptr str long ptr ptr ptr) @ stdcall D3DXCreateEffectFromResourceW(ptr long wstr ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectPool(ptr) @ stdcall D3DXCreateFontA(ptr long long long long long long long long long str ptr) @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stdcall -stub D3DXCreateNPatchMesh(ptr ptr) @ stdcall -stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall -stub D3DXCreatePRTBuffer(long long long ptr) @ stdcall -stub D3DXCreatePRTBufferTex(long long long long ptr) @ stdcall -stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stdcall -stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stdcall -stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stdcall -stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stdcall -stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -121,13 +121,14 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @ stdcall D3DXFillTexture(ptr ptr ptr) -@ stdcall -stub D3DXFillTextureTX(ptr ptr) +@ stdcall D3DXFillTextureTX(ptr ptr) @ stdcall D3DXFillVolumeTexture(ptr ptr ptr) -@ stdcall -stub D3DXFillVolumeTextureTX(ptr ptr) +@ stdcall D3DXFillVolumeTextureTX(ptr ptr) @ stdcall D3DXFilterTexture(ptr ptr long long) @ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stdcall D3DXFloat16To32Array(ptr ptr long) @@ -139,7 +140,6 @@ @ stdcall -stub D3DXFrameNumNamedMatrices(ptr) @ stdcall -stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall -stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) @ stdcall -stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) @ stdcall -stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) @@ -176,11 +176,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall -stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stdcall -stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stdcall -stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stdcall -stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stdcall -stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @@ -255,23 +255,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stdcall -stub D3DXRectPatchSize(ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -284,12 +267,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stdcall -stub D3DXSHMultiply5(ptr ptr ptr) @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stdcall -stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stdcall -stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stdcall -stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stdcall -stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stdcall -stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stdcall -stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stdcall -stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stdcall -stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stdcall -stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stdcall -stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stdcall -stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall -stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stdcall -stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36_main.c b/dll/directx/wine/d3dx9_36/d3dx9_36_main.c index a335475a3d..01c5219bf0 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_36_main.c +++ b/dll/directx/wine/d3dx9_36/d3dx9_36_main.c @@ -49,21 +49,3 @@ BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) else return FALSE; } - -/*********************************************************************** - * D3DXDebugMute - * Returns always FALSE for us. - */ -BOOL WINAPI D3DXDebugMute(BOOL mute) -{ - return FALSE; -} - -/*********************************************************************** - * D3DXGetDriverLevel. - * Returns always 900 (DX 9) for us - */ -UINT WINAPI D3DXGetDriverLevel(struct IDirect3DDevice9 *device) -{ - return 900; -} diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36_private.h b/dll/directx/wine/d3dx9_36/d3dx9_36_private.h index da25773ca9..72b1c9d38d 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_36_private.h +++ b/dll/directx/wine/d3dx9_36/d3dx9_36_private.h @@ -46,6 +46,8 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +#define ULONG64_MAX (~(ULONG64)0) + #define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array)) struct vec4 @@ -83,6 +85,22 @@ struct pixel_format_desc { void (*to_rgba)(const struct vec4 *src, struct vec4 *dst, const PALETTEENTRY *palette); }; +static inline BOOL is_conversion_from_supported(const struct pixel_format_desc *format) +{ + if (format->type == FORMAT_ARGB || format->type == FORMAT_ARGBF16 + || format->type == FORMAT_ARGBF) + return TRUE; + return !!format->to_rgba; +} + +static inline BOOL is_conversion_to_supported(const struct pixel_format_desc *format) +{ + if (format->type == FORMAT_ARGB || format->type == FORMAT_ARGBF16 + || format->type == FORMAT_ARGBF) + return TRUE; + return !!format->from_rgba; +} + HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) DECLSPEC_HIDDEN; HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length) DECLSPEC_HIDDEN; @@ -125,8 +143,268 @@ const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; /* parameter type conversion helpers */ -void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, - const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; +static inline BOOL get_bool(D3DXPARAMETER_TYPE type, const void *data) +{ + switch (type) + { + case D3DXPT_FLOAT: + case D3DXPT_INT: + case D3DXPT_BOOL: + return !!*(DWORD *)data; + + case D3DXPT_VOID: + return *(BOOL *)data; + + default: + return FALSE; + } +} + +static inline int get_int(D3DXPARAMETER_TYPE type, const void *data) +{ + switch (type) + { + case D3DXPT_FLOAT: + return (int)(*(float *)data); + + case D3DXPT_INT: + case D3DXPT_VOID: + return *(int *)data; + + case D3DXPT_BOOL: + return get_bool(type, data); + + default: + return 0; + } +} + +static inline float get_float(D3DXPARAMETER_TYPE type, const void *data) +{ + switch (type) + { + case D3DXPT_FLOAT: + case D3DXPT_VOID: + return *(float *)data; + + case D3DXPT_INT: + return (float)(*(int *)data); + + case D3DXPT_BOOL: + return (float)get_bool(type, data); + + default: + return 0.0f; + } +} + +static inline void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) +{ + if (outtype == intype) + { + *(DWORD *)outdata = *(DWORD *)indata; + return; + } + + switch (outtype) + { + case D3DXPT_FLOAT: + *(float *)outdata = get_float(intype, indata); + break; + + case D3DXPT_BOOL: + *(BOOL *)outdata = get_bool(intype, indata); + break; + + case D3DXPT_INT: + *(int *)outdata = get_int(intype, indata); + break; + + default: + *(DWORD *)outdata = 0; + break; + } +} + +static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type) +{ + return type == D3DXPT_SAMPLER + || type == D3DXPT_SAMPLER1D || type == D3DXPT_SAMPLER2D + || type == D3DXPT_SAMPLER3D || type == D3DXPT_SAMPLERCUBE; +} + +struct d3dx_parameter; + +enum pres_reg_tables +{ + PRES_REGTAB_IMMED, + PRES_REGTAB_CONST, + PRES_REGTAB_OCONST, + PRES_REGTAB_OBCONST, + PRES_REGTAB_OICONST, + PRES_REGTAB_TEMP, + PRES_REGTAB_COUNT, + PRES_REGTAB_FIRST_SHADER = PRES_REGTAB_CONST, +}; + +struct d3dx_const_param_eval_output +{ + struct d3dx_parameter *param; + enum pres_reg_tables table; + enum D3DXPARAMETER_CLASS constant_class; + unsigned int register_index; + unsigned int register_count; + BOOL direct_copy; + unsigned int element_count; +}; + +struct d3dx_const_tab +{ + unsigned int input_count; + D3DXCONSTANT_DESC *inputs; + struct d3dx_parameter **inputs_param; + unsigned int const_set_count; + unsigned int const_set_size; + struct d3dx_const_param_eval_output *const_set; + const enum pres_reg_tables *regset2table; + ULONG64 update_version; +}; + +struct d3dx_regstore +{ + void *tables[PRES_REGTAB_COUNT]; + unsigned int table_sizes[PRES_REGTAB_COUNT]; /* registers count */ +}; + +struct d3dx_pres_ins; + +struct d3dx_preshader +{ + struct d3dx_regstore regs; + + unsigned int ins_count; + struct d3dx_pres_ins *ins; + + struct d3dx_const_tab inputs; +}; + +struct d3dx_param_eval +{ + D3DXPARAMETER_TYPE param_type; + + struct d3dx_preshader pres; + struct d3dx_const_tab shader_inputs; + + ULONG64 *version_counter; +}; + +struct d3dx_shared_data; +struct d3dx_top_level_parameter; + +struct d3dx_parameter +{ + char magic_string[4]; + struct d3dx_top_level_parameter *top_level_param; + struct d3dx_param_eval *param_eval; + char *name; + void *data; + D3DXPARAMETER_CLASS class; + D3DXPARAMETER_TYPE type; + UINT rows; + UINT columns; + UINT element_count; + UINT member_count; + DWORD flags; + UINT bytes; + DWORD object_id; + + struct d3dx_parameter *members; + char *semantic; +}; + +struct d3dx_top_level_parameter +{ + struct d3dx_parameter param; + UINT annotation_count; + struct d3dx_parameter *annotations; + ULONG64 update_version; + ULONG64 *version_counter; + struct d3dx_shared_data *shared_data; +}; + +struct d3dx_shared_data +{ + void *data; + struct d3dx_top_level_parameter **parameters; + unsigned int size, count; + ULONG64 update_version; +}; + +struct d3dx9_base_effect; + +static inline BOOL is_top_level_parameter(struct d3dx_parameter *param) +{ + return &param->top_level_param->param == param; +} + +static inline struct d3dx_top_level_parameter + *top_level_parameter_from_parameter(struct d3dx_parameter *param) +{ + return CONTAINING_RECORD(param, struct d3dx_top_level_parameter, param); +} + +static inline ULONG64 next_update_version(ULONG64 *version_counter) +{ + return ++*version_counter; +} + +static inline BOOL is_top_level_param_dirty(struct d3dx_top_level_parameter *param, ULONG64 update_version) +{ + struct d3dx_shared_data *shared_data; + + if ((shared_data = param->shared_data)) + return update_version < shared_data->update_version; + else + return update_version < param->update_version; +} + +static inline BOOL is_param_dirty(struct d3dx_parameter *param, ULONG64 update_version) +{ + return is_top_level_param_dirty(param->top_level_param, update_version); +} + +struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, + struct d3dx_parameter *parameter, const char *name) DECLSPEC_HIDDEN; + +#ifdef __REACTOS__ +#define SET_D3D_STATE_(_manager, _device, _method, ...) ((_manager) ? (_manager)->lpVtbl->_method((_manager), __VA_ARGS__) \ + : (_device)->lpVtbl->_method((_device), __VA_ARGS__)) +#define SET_D3D_STATE(_base_effect, _method, ...) SET_D3D_STATE_((_base_effect)->manager, (_base_effect)->device, _method, __VA_ARGS__) +#else +#define SET_D3D_STATE_(manager, device, method, args...) (manager ? manager->lpVtbl->method(manager, args) \ + : device->lpVtbl->method(device, args)) +#define SET_D3D_STATE(base_effect, args...) SET_D3D_STATE_(base_effect->manager, base_effect->device, args) +#endif + +HRESULT d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_code, + unsigned int byte_code_size, D3DXPARAMETER_TYPE type, + struct d3dx_param_eval **peval, ULONG64 *version_counter, + const char **skip_constants, unsigned int skip_constants_count) DECLSPEC_HIDDEN; +void d3dx_free_param_eval(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN; +HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, + const struct d3dx_parameter *param, void *param_value) DECLSPEC_HIDDEN; +HRESULT d3dx_param_eval_set_shader_constants(ID3DXEffectStateManager *manager, struct IDirect3DDevice9 *device, + struct d3dx_param_eval *peval, BOOL update_all) DECLSPEC_HIDDEN; +BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval, ULONG64 update_version) DECLSPEC_HIDDEN; + +struct ctab_constant { + D3DXCONSTANT_DESC desc; + WORD constantinfo_reserved; + struct ctab_constant *constants; +}; + +const struct ctab_constant *d3dx_shader_get_ctab_constant(ID3DXConstantTable *iface, + D3DXHANDLE constant) DECLSPEC_HIDDEN; HRESULT create_dummy_skin(ID3DXSkinInfo **iface) DECLSPEC_HIDDEN; diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index d6779829ba..039ab42232 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -22,15 +22,15 @@ #include <d3dcompiler.h> #include <initguid.h> -/* d3dx9_26 provides an ID3DXEffect interface where the last function SetRawValue - * is missing. Since its otherwise identical, we just use the same vtable. */ -DEFINE_GUID(IID_ID3DXEffect26, 0xc7b17651, 0x5420, 0x490e, 0x8a, 0x7f, 0x92, 0x36, 0x75, 0xa2, 0xd6, 0x87); - /* Constants for special INT/FLOAT conversation */ #define INT_FLOAT_MULTI 255.0f #define INT_FLOAT_MULTI_INVERSE (1/INT_FLOAT_MULTI) -#define INITIAL_PARAM_TABLE_SIZE 16 +static const char parameter_magic_string[4] = {'@', '!', '#', '\xFF'}; + +#define PARAMETER_FLAG_SHARED 1 + +#define INITIAL_POOL_SIZE 16 enum STATE_CLASS { @@ -95,30 +95,6 @@ enum STATE_TYPE ST_ARRAY_SELECTOR, }; -struct d3dx_parameter -{ - char *name; - char *semantic; - void *data; - D3DXPARAMETER_CLASS class; - D3DXPARAMETER_TYPE type; - UINT rows; - UINT columns; - UINT element_count; - UINT annotation_count; - UINT member_count; - DWORD flags; - UINT bytes; - DWORD object_id; - - D3DXHANDLE handle; - - struct d3dx_parameter *annotations; - struct d3dx_parameter *members; - - struct d3dx_parameter *referenced_param; -}; - struct d3dx_object { UINT size; @@ -132,6 +108,7 @@ struct d3dx_state UINT index; enum STATE_TYPE type; struct d3dx_parameter parameter; + struct d3dx_parameter *referenced_param; }; struct d3dx_sampler @@ -148,6 +125,8 @@ struct d3dx_pass struct d3dx_state *states; struct d3dx_parameter *annotations; + + ULONG64 update_version; }; struct d3dx_technique @@ -158,12 +137,8 @@ struct d3dx_technique struct d3dx_parameter *annotations; struct d3dx_pass *passes; -}; -struct param_table -{ - struct d3dx_parameter **table; - unsigned int count, size; + struct IDirect3DStateBlock9 *saved_state; }; struct d3dx9_base_effect @@ -174,11 +149,14 @@ struct d3dx9_base_effect UINT technique_count; UINT object_count; - struct d3dx_parameter *parameters; + struct d3dx_top_level_parameter *parameters; struct d3dx_technique *techniques; struct d3dx_object *objects; - struct param_table param_table; + struct d3dx_effect_pool *pool; + DWORD flags; + + ULONG64 version_counter; }; struct ID3DXEffectImpl @@ -194,7 +172,25 @@ struct ID3DXEffectImpl struct d3dx_technique *active_technique; struct d3dx_pass *active_pass; BOOL started; - DWORD flags; + DWORD begin_flags; + + D3DLIGHT9 current_light[8]; + unsigned int light_updated; + D3DMATERIAL9 current_material; + BOOL material_updated; +}; + +#define INITIAL_SHARED_DATA_SIZE 4 + +struct d3dx_effect_pool +{ + ID3DXEffectPool ID3DXEffectPool_iface; + LONG refcount; + + struct d3dx_shared_data *shared_data; + unsigned int size; + + ULONG64 version_counter; }; struct ID3DXEffectCompilerImpl @@ -205,14 +201,14 @@ struct ID3DXEffectCompilerImpl struct d3dx9_base_effect base_effect; }; -static struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, - struct d3dx_parameter *parameter, const char *name); static struct d3dx_parameter *get_annotation_by_name(UINT count, struct d3dx_parameter *parameters, const char *name); static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_state *state, const char *data, const char **ptr, struct d3dx_object *objects); static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child); +typedef BOOL (*walk_parameter_dep_func)(void *data, struct d3dx_parameter *param); + static const struct { enum STATE_CLASS class; @@ -221,7 +217,7 @@ static const struct } state_table[] = { - /* Render sates */ + /* Render states */ {SC_RENDERSTATE, D3DRS_ZENABLE, "D3DRS_ZENABLE"}, /* 0x0 */ {SC_RENDERSTATE, D3DRS_FILLMODE, "D3DRS_FILLMODE"}, {SC_RENDERSTATE, D3DRS_SHADEMODE, "D3DRS_SHADEMODE"}, @@ -373,7 +369,7 @@ state_table[] = {SC_LIGHT, LT_ATTENUATION2, "LightAttenuation2"}, {SC_LIGHT, LT_THETA, "LightTheta"}, {SC_LIGHT, LT_PHI, "LightPhi"}, /* 0x90 */ - /* Ligthenable */ + /* Lightenable */ {SC_LIGHTENABLE, 0, "LightEnable"}, /* Vertexshader */ {SC_VERTEXSHADER, 0, "Vertexshader"}, @@ -427,27 +423,27 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) unsigned int i; DWORD d; - FIXME("Skipping %u unknown DWORDs:\n", count); + WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) { read_dword(ptr, &d); - FIXME("\t0x%08x\n", d); + WARN("\t0x%08x\n", d); } } static inline D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) { - return parameter ? parameter->handle : NULL; + return (D3DXHANDLE)parameter; } static inline D3DXHANDLE get_technique_handle(struct d3dx_technique *technique) { - return (D3DXHANDLE) technique; + return (D3DXHANDLE)technique; } static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) { - return (D3DXHANDLE) pass; + return (D3DXHANDLE)pass; } static struct d3dx_technique *get_technique_by_name(struct d3dx9_base_effect *base, const char *name) @@ -498,12 +494,13 @@ static struct d3dx_pass *get_valid_pass(struct d3dx9_base_effect *base, D3DXHAND static struct d3dx_parameter *get_valid_parameter(struct d3dx9_base_effect *base, D3DXHANDLE parameter) { - struct d3dx_parameter **handle_param = (struct d3dx_parameter **)parameter; + struct d3dx_parameter *handle_param = (struct d3dx_parameter *)parameter; - if (handle_param >= base->param_table.table && handle_param < base->param_table.table + base->param_table.count) - return *handle_param; + if (handle_param && !strncmp(handle_param->magic_string, parameter_magic_string, + sizeof(parameter_magic_string))) + return handle_param; - return get_parameter_by_name(base, NULL, parameter); + return base->flags & D3DXFX_LARGEADDRESSAWARE ? NULL : get_parameter_by_name(base, NULL, parameter); } static void free_state(struct d3dx_state *state) @@ -527,34 +524,12 @@ static void free_sampler(struct d3dx_sampler *sampler) HeapFree(GetProcessHeap(), 0, sampler->states); } -static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child) -{ - unsigned int i; - - TRACE("Free parameter %p, name %s, type %s, child %s\n", param, param->name, - debug_d3dxparameter_type(param->type), child ? "yes" : "no"); +static void d3dx_pool_release_shared_parameter(struct d3dx_top_level_parameter *param); - if (!param) +static void free_parameter_data(struct d3dx_parameter *param, BOOL child) +{ + if (!param->data) return; - - if (param->annotations) - { - for (i = 0; i < param->annotation_count; ++i) - free_parameter(&param->annotations[i], FALSE, FALSE); - HeapFree(GetProcessHeap(), 0, param->annotations); - param->annotations = NULL; - } - - if (param->members) - { - unsigned int count = param->element_count ? param->element_count : param->member_count; - - for (i = 0; i < count; ++i) - free_parameter(&param->members[i], param->element_count != 0, TRUE); - HeapFree(GetProcessHeap(), 0, param->members); - param->members = NULL; - } - if (param->class == D3DXPC_OBJECT && !param->element_count) { switch (param->type) @@ -586,12 +561,31 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil break; } } - if (!child) - { HeapFree(GetProcessHeap(), 0, param->data); +} + +static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child) +{ + unsigned int i; + + TRACE("Free parameter %p, name %s, type %s, element %#x, child %#x.\n", param, param->name, + debug_d3dxparameter_type(param->type), element, child); + + if (param->param_eval) + d3dx_free_param_eval(param->param_eval); + + if (param->members) + { + unsigned int count = param->element_count ? param->element_count : param->member_count; + + for (i = 0; i < count; ++i) + free_parameter(&param->members[i], param->element_count != 0, TRUE); + HeapFree(GetProcessHeap(), 0, param->members); } + free_parameter_data(param, child); + /* only the parent has to release name and semantic */ if (!element) { @@ -600,6 +594,20 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil } } +static void free_top_level_parameter(struct d3dx_top_level_parameter *param) +{ + if (param->annotations) + { + unsigned int i; + + for (i = 0; i < param->annotation_count; ++i) + free_parameter(&param->annotations[i], FALSE, FALSE); + HeapFree(GetProcessHeap(), 0, param->annotations); + } + d3dx_pool_release_shared_parameter(param); + free_parameter(&param->param, FALSE, FALSE); +} + static void free_pass(struct d3dx_pass *pass) { unsigned int i; @@ -638,6 +646,12 @@ static void free_technique(struct d3dx_technique *technique) if (!technique) return; + if (technique->saved_state) + { + IDirect3DStateBlock9_Release(technique->saved_state); + technique->saved_state = NULL; + } + if (technique->annotations) { for (i = 0; i < technique->annotation_count; ++i) @@ -664,12 +678,10 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) TRACE("base %p.\n", base); - HeapFree(GetProcessHeap(), 0, base->param_table.table); - if (base->parameters) { for (i = 0; i < base->parameter_count; ++i) - free_parameter(&base->parameters[i], FALSE, FALSE); + free_top_level_parameter(&base->parameters[i]); HeapFree(GetProcessHeap(), 0, base->parameters); base->parameters = NULL; } @@ -821,9 +833,6 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete case '.': return get_parameter_by_name(NULL, temp_parameter, part); - case '@': - return get_annotation_by_name(temp_parameter->annotation_count, temp_parameter->annotations, part); - case '\0': TRACE("Returning parameter %p\n", temp_parameter); return temp_parameter; @@ -882,35 +891,25 @@ static struct d3dx_parameter *get_annotation_by_name(UINT count, struct d3dx_par return NULL; } -static struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, +struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, struct d3dx_parameter *parameter, const char *name) { UINT i, count, length; struct d3dx_parameter *temp_parameter; - struct d3dx_parameter *parameters; const char *part; TRACE("base %p, parameter %p, name %s\n", base, parameter, debugstr_a(name)); if (!name || !*name) return NULL; - if (!parameter) - { - count = base->parameter_count; - parameters = base->parameters; - } - else - { - count = parameter->member_count; - parameters = parameter->members; - } - + count = parameter ? parameter->member_count : base->parameter_count; length = strcspn( name, "[.@" ); part = name + length; for (i = 0; i < count; i++) { - temp_parameter = &parameters[i]; + temp_parameter = !parameter ? &base->parameters[i].param + : &parameter->members[i]; if (!strcmp(temp_parameter->name, name)) { @@ -925,8 +924,13 @@ static struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *ba return get_parameter_by_name(NULL, temp_parameter, part); case '@': - return get_annotation_by_name(temp_parameter->annotation_count, temp_parameter->annotations, part); + { + struct d3dx_top_level_parameter *top_param + = top_level_parameter_from_parameter(temp_parameter); + return parameter ? NULL : get_annotation_by_name(top_param->annotation_count, + top_param->annotations, part); + } case '[': return get_parameter_element_by_name(temp_parameter, part); @@ -983,7 +987,8 @@ static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *ba desc->Rows = param->rows; desc->Columns = param->columns; desc->Elements = param->element_count; - desc->Annotations = param->annotation_count; + desc->Annotations = is_top_level_parameter(param) + ? top_level_parameter_from_parameter(param)->annotation_count : 0; desc->StructMembers = param->member_count; desc->Flags = param->flags; desc->Bytes = param->bytes; @@ -1009,24 +1014,150 @@ static HRESULT d3dx9_base_effect_get_technique_desc(struct d3dx9_base_effect *ba return D3D_OK; } +static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_state *state, + void **param_value, struct d3dx_parameter **out_param, + BOOL update_all, BOOL *param_dirty) +{ + struct d3dx_parameter *param = &state->parameter; + + *param_value = NULL; + *out_param = NULL; + *param_dirty = FALSE; + + switch (state->type) + { + case ST_PARAMETER: + param = state->referenced_param; + *param_dirty = is_param_dirty(param, pass->update_version); + /* fallthrough */ + case ST_CONSTANT: + *out_param = param; + *param_value = param->data; + return D3D_OK; + case ST_ARRAY_SELECTOR: + { + unsigned int array_idx; + static const struct d3dx_parameter array_idx_param = + {"", NULL, NULL, NULL, NULL, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 0, 0, 0, sizeof(array_idx)}; + HRESULT hr; + struct d3dx_parameter *ref_param, *selected_param; + + if (!param->param_eval) + { + FIXME("Preshader structure is null.\n"); + return D3DERR_INVALIDCALL; + } + /* We override with the update_version of the pass because we want + * to force index recomputation and check for out of bounds. */ + if (is_param_eval_input_dirty(param->param_eval, pass->update_version)) + { + if (FAILED(hr = d3dx_evaluate_parameter(param->param_eval, &array_idx_param, &array_idx))) + return hr; + } + else + { + array_idx = state->index; + } + ref_param = state->referenced_param; + TRACE("Array index %u, stored array index %u, element_count %u.\n", array_idx, state->index, + ref_param->element_count); + /* According to the tests, native d3dx handles the case of array index evaluated to -1 + * in a specific way, always selecting first array element and not returning error. */ + if (array_idx == ~0u) + { + WARN("Array index is -1, setting to 0.\n"); + array_idx = 0; + } + + if (array_idx >= ref_param->element_count) + { + WARN("Computed array index %u is larger than array size %u.\n", + array_idx, ref_param->element_count); + return E_FAIL; + } + selected_param = &ref_param->members[array_idx]; + *param_dirty = state->index != array_idx || is_param_dirty(selected_param, pass->update_version); + state->index = array_idx; + + *param_value = selected_param->data; + *out_param = selected_param; + return D3D_OK; + } + case ST_FXLC: + if (param->param_eval) + { + *out_param = param; + *param_value = param->data; + /* We check with the update_version of the pass because the + * same preshader might be used by both the vertex and the + * pixel shader (that can happen e.g. for sampler states). */ + if (update_all || is_param_eval_input_dirty(param->param_eval, pass->update_version)) + { + *param_dirty = TRUE; + return d3dx_evaluate_parameter(param->param_eval, param, *param_value); + } + else + return D3D_OK; + } + else + { + FIXME("No preshader for FXLC parameter.\n"); + return D3DERR_INVALIDCALL; + } + } + return E_NOTIMPL; +} + static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, - D3DXHANDLE pass, D3DXPASS_DESC *desc) + D3DXHANDLE pass_handle, D3DXPASS_DESC *desc) { - struct d3dx_pass *p = get_valid_pass(base, pass); + struct d3dx_pass *pass = get_valid_pass(base, pass_handle); + unsigned int i; - if (!desc || !p) + if (!desc || !pass) { WARN("Invalid argument specified.\n"); return D3DERR_INVALIDCALL; } - desc->Name = p->name; - desc->Annotations = p->annotation_count; + desc->Name = pass->name; + desc->Annotations = pass->annotation_count; - FIXME("Pixel shader and vertex shader are not supported, yet.\n"); desc->pVertexShaderFunction = NULL; desc->pPixelShaderFunction = NULL; + if (base->flags & D3DXFX_NOT_CLONEABLE) + return D3D_OK; + + for (i = 0; i < pass->state_count; ++i) + { + struct d3dx_state *state = &pass->states[i]; + + if (state_table[state->operation].class == SC_VERTEXSHADER + || state_table[state->operation].class == SC_PIXELSHADER) + { + struct d3dx_parameter *param; + void *param_value; + BOOL param_dirty; + HRESULT hr; + + if (FAILED(hr = d3dx9_get_param_value_ptr(pass, &pass->states[i], &param_value, &param, + FALSE, &param_dirty))) + return hr; + + if (!param->object_id) + { + FIXME("Zero object ID in shader parameter.\n"); + return E_FAIL; + } + + if (state_table[state->operation].class == SC_VERTEXSHADER) + desc->pVertexShaderFunction = base->objects[param->object_id].data; + else + desc->pPixelShaderFunction = base->objects[param->object_id].data; + } + } + return D3D_OK; } @@ -1048,7 +1179,7 @@ static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base if (index < base->parameter_count) { TRACE("Returning parameter %p.\n", &base->parameters[index]); - return get_parameter_handle(&base->parameters[index]); + return get_parameter_handle(&base->parameters[index].param); } } else @@ -1095,7 +1226,7 @@ static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_ { for (i = 0; i < base->parameter_count; ++i) { - temp_param = &base->parameters[i]; + temp_param = &base->parameters[i].param; if (!temp_param->semantic) { @@ -1153,7 +1284,7 @@ static D3DXHANDLE d3dx9_base_effect_get_parameter_element(struct d3dx9_base_effe if (index < base->parameter_count) { TRACE("Returning parameter %p.\n", &base->parameters[index]); - return get_parameter_handle(&base->parameters[index]); + return get_parameter_handle(&base->parameters[index].param); } } else @@ -1274,8 +1405,19 @@ static UINT get_annotation_from_object(struct d3dx9_base_effect *base, } else if (param) { - *annotations = param->annotations; - return param->annotation_count; + if (is_top_level_parameter(param)) + { + struct d3dx_top_level_parameter *top_param + = top_level_parameter_from_parameter(param); + + *annotations = top_param->annotations; + return top_param->annotation_count; + } + else + { + *annotations = NULL; + return 0; + } } else { @@ -1330,10 +1472,64 @@ static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_eff return NULL; } +static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep_func param_func, + void *data) +{ + unsigned int i; + unsigned int member_count; + + if (param_func(data, param)) + return TRUE; + + member_count = param->element_count ? param->element_count : param->member_count; + for (i = 0; i < member_count; ++i) + { + if (walk_parameter_tree(&param->members[i], param_func, data)) + return TRUE; + } + return FALSE; +} + +static ULONG64 *get_version_counter_ptr(struct d3dx9_base_effect *base) +{ + return base->pool ? &base->pool->version_counter : &base->version_counter; +} + +static ULONG64 next_effect_update_version(struct d3dx9_base_effect *base) +{ + return next_update_version(get_version_counter_ptr(base)); +} + +static void set_dirty(struct d3dx_parameter *param) +{ + struct d3dx_shared_data *shared_data; + struct d3dx_top_level_parameter *top_param = param->top_level_param; + ULONG64 new_update_version = next_update_version(top_param->version_counter); + + if ((shared_data = top_param->shared_data)) + shared_data->update_version = new_update_version; + else + top_param->update_version = new_update_version; +} + +static HRESULT set_string(char **param_data, const char *string) +{ + HeapFree(GetProcessHeap(), 0, *param_data); + *param_data = HeapAlloc(GetProcessHeap(), 0, strlen(string) + 1); + if (!*param_data) + { + ERR("Out of memory.\n"); + return E_OUTOFMEMORY; + } + strcpy(*param_data, string); + return D3D_OK; +} + static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const void *data, UINT bytes) { struct d3dx_parameter *param = get_valid_parameter(base, parameter); + unsigned int i; if (!param) { @@ -1342,9 +1538,7 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, } /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER - || param->type == D3DXPT_SAMPLER1D || param->type == D3DXPT_SAMPLER2D - || param->type == D3DXPT_SAMPLER3D || param->type == D3DXPT_SAMPLERCUBE)) + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) { TRACE("Sampler: returning E_FAIL\n"); return E_FAIL; @@ -1354,16 +1548,46 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, { switch (param->type) { + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *unk = ((IUnknown **)data)[i]; + if (unk) + IUnknown_AddRef(unk); + + unk = ((IUnknown **)param->data)[i]; + if (unk) + IUnknown_Release(unk); + } + /* fallthrough */ case D3DXPT_VOID: case D3DXPT_BOOL: case D3DXPT_INT: case D3DXPT_FLOAT: - TRACE("Copy %u bytes\n", param->bytes); + TRACE("Copy %u bytes.\n", param->bytes); memcpy(param->data, data, param->bytes); + set_dirty(param); break; + case D3DXPT_STRING: + { + HRESULT hr; + + set_dirty(param); + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) + return hr; + } + break; + } + default: - FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); break; } @@ -1387,9 +1611,7 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, } /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER - || param->type == D3DXPT_SAMPLER1D || param->type == D3DXPT_SAMPLER2D - || param->type == D3DXPT_SAMPLER3D || param->type == D3DXPT_SAMPLERCUBE)) + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) { TRACE("Sampler: returning E_FAIL\n"); return E_FAIL; @@ -1448,6 +1670,7 @@ static HRESULT d3dx9_base_effect_set_bool(struct d3dx9_base_effect *base, D3DXHA if (param && !param->element_count && param->rows == 1 && param->columns == 1) { set_number(param->data, param->type, &b, D3DXPT_BOOL); + set_dirty(param); return D3D_OK; } @@ -1493,6 +1716,7 @@ static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, /* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */ set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT); } + set_dirty(param); return D3D_OK; case D3DXPC_OBJECT: @@ -1542,7 +1766,12 @@ static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHAN { if (param->rows == 1 && param->columns == 1) { - set_number(param->data, param->type, &n, D3DXPT_INT); + DWORD value; + + set_number(&value, param->type, &n, D3DXPT_INT); + if (value != *(DWORD *)param->data) + set_dirty(param); + *(DWORD *)param->data = value; return D3D_OK; } @@ -1562,6 +1791,7 @@ static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHAN { ((FLOAT *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; } + set_dirty(param); return D3D_OK; } } @@ -1629,6 +1859,7 @@ static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, { set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT); } + set_dirty(param); return D3D_OK; case D3DXPC_OBJECT: @@ -1676,7 +1907,12 @@ static HRESULT d3dx9_base_effect_set_float(struct d3dx9_base_effect *base, D3DXH if (param && !param->element_count && param->rows == 1 && param->columns == 1) { - set_number((DWORD *)param->data, param->type, &f, D3DXPT_FLOAT); + DWORD value; + + set_number(&value, param->type, &f, D3DXPT_FLOAT); + if (value != *(DWORD *)param->data) + set_dirty(param); + *(DWORD *)param->data = value; return D3D_OK; } @@ -1721,6 +1957,7 @@ static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base, { set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT); } + set_dirty(param); return D3D_OK; case D3DXPC_OBJECT: @@ -1775,6 +2012,7 @@ static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, { case D3DXPC_SCALAR: case D3DXPC_VECTOR: + set_dirty(param); if (param->type == D3DXPT_INT && param->bytes == 4) { DWORD tmp; @@ -1868,6 +2106,7 @@ static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base switch (param->class) { case D3DXPC_VECTOR: + set_dirty(param); if (param->type == D3DXPT_FLOAT) { if (param->columns == 4) @@ -1954,6 +2193,7 @@ static HRESULT d3dx9_base_effect_set_matrix(struct d3dx9_base_effect *base, { case D3DXPC_MATRIX_ROWS: set_matrix(param, matrix); + set_dirty(param); return D3D_OK; case D3DXPC_SCALAR: @@ -2019,6 +2259,7 @@ static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); for (i = 0; i < count; ++i) { set_matrix(&param->members[i], &matrix[i]); @@ -2093,6 +2334,7 @@ static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effe switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); for (i = 0; i < count; ++i) { set_matrix(&param->members[i], matrix[i]); @@ -2165,6 +2407,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect * switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); set_matrix_transpose(param, matrix); return D3D_OK; @@ -2234,6 +2477,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_ef switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); for (i = 0; i < count; ++i) { set_matrix_transpose(&param->members[i], &matrix[i]); @@ -2308,6 +2552,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9 switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); for (i = 0; i < count; ++i) { set_matrix_transpose(&param->members[i], matrix[i]); @@ -2371,9 +2616,17 @@ static HRESULT d3dx9_base_effect_get_matrix_transpose_pointer_array(struct d3dx9 static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const char *string) { - FIXME("stub!\n"); + struct d3dx_parameter *param = get_valid_parameter(base, parameter); - return E_NOTIMPL; + if (param && param->type == D3DXPT_STRING) + { + set_dirty(param); + return set_string(param->data, string); + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT d3dx9_base_effect_get_string(struct d3dx9_base_effect *base, @@ -2412,6 +2665,7 @@ static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, if (oltexture) IDirect3DBaseTexture9_Release(oltexture); *(struct IDirect3DBaseTexture9 **)param->data = texture; + set_dirty(param); return D3D_OK; } @@ -2467,23 +2721,596 @@ static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *bas if (shader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) { - if ((*shader = *(struct IDirect3DVertexShader9 **)param->data)) - IDirect3DVertexShader9_AddRef(*shader); - TRACE("Returning %p.\n", *shader); - return D3D_OK; + if ((*shader = *(struct IDirect3DVertexShader9 **)param->data)) + IDirect3DVertexShader9_AddRef(*shader); + TRACE("Returning %p.\n", *shader); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; +} + +static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, + D3DXHANDLE parameter, UINT start, UINT end) +{ + FIXME("stub!\n"); + + return E_NOTIMPL; +} + +static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) +{ + static const struct + { + unsigned int offset; + const char *name; + } + light_tbl[] = + { + {FIELD_OFFSET(D3DLIGHT9, Type), "LC_TYPE"}, + {FIELD_OFFSET(D3DLIGHT9, Diffuse), "LT_DIFFUSE"}, + {FIELD_OFFSET(D3DLIGHT9, Specular), "LT_SPECULAR"}, + {FIELD_OFFSET(D3DLIGHT9, Ambient), "LT_AMBIENT"}, + {FIELD_OFFSET(D3DLIGHT9, Position), "LT_POSITION"}, + {FIELD_OFFSET(D3DLIGHT9, Direction), "LT_DIRECTION"}, + {FIELD_OFFSET(D3DLIGHT9, Range), "LT_RANGE"}, + {FIELD_OFFSET(D3DLIGHT9, Falloff), "LT_FALLOFF"}, + {FIELD_OFFSET(D3DLIGHT9, Attenuation0), "LT_ATTENUATION0"}, + {FIELD_OFFSET(D3DLIGHT9, Attenuation1), "LT_ATTENUATION1"}, + {FIELD_OFFSET(D3DLIGHT9, Attenuation2), "LT_ATTENUATION2"}, + {FIELD_OFFSET(D3DLIGHT9, Theta), "LT_THETA"}, + {FIELD_OFFSET(D3DLIGHT9, Phi), "LT_PHI"} + }; + switch (op) + { + case LT_TYPE: + TRACE("LT_TYPE %u.\n", *(D3DLIGHTTYPE *)value); + light->Type = *(D3DLIGHTTYPE *)value; + break; + case LT_DIFFUSE: + case LT_SPECULAR: + case LT_AMBIENT: + { + D3DCOLORVALUE c = *(D3DCOLORVALUE *)value; + + TRACE("%s (%.8e %.8e %.8e %.8e).\n", light_tbl[op].name, c.r, c.g, c.b, c.a); + *(D3DCOLORVALUE *)((BYTE *)light + light_tbl[op].offset) = c; + break; + } + case LT_POSITION: + case LT_DIRECTION: + { + D3DVECTOR v = *(D3DVECTOR *)value; + + TRACE("%s (%.8e %.8e %.8e).\n", light_tbl[op].name, v.x, v.y, v.z); + *(D3DVECTOR *)((BYTE *)light + light_tbl[op].offset) = v; + break; + } + case LT_RANGE: + case LT_FALLOFF: + case LT_ATTENUATION0: + case LT_ATTENUATION1: + case LT_ATTENUATION2: + case LT_THETA: + case LT_PHI: + { + float v = *(float *)value; + TRACE("%s %.8e.\n", light_tbl[op].name, v); + *(float *)((BYTE *)light + light_tbl[op].offset) = v; + break; + } + default: + WARN("Unknown light parameter %u.\n", op); + break; + } +} + +static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *material, void *value) +{ + static const struct + { + unsigned int offset; + const char *name; + } + material_tbl[] = + { + {FIELD_OFFSET(D3DMATERIAL9, Diffuse), "MT_DIFFUSE"}, + {FIELD_OFFSET(D3DMATERIAL9, Ambient), "MT_AMBIENT"}, + {FIELD_OFFSET(D3DMATERIAL9, Specular), "MT_SPECULAR"}, + {FIELD_OFFSET(D3DMATERIAL9, Emissive), "MT_EMISSIVE"}, + {FIELD_OFFSET(D3DMATERIAL9, Power), "MT_POWER"} + }; + + switch (op) + { + case MT_POWER: + { + float v = *(float *)value; + + TRACE("%s %.8e.\n", material_tbl[op].name, v); + material->Power = v; + break; + } + case MT_DIFFUSE: + case MT_AMBIENT: + case MT_SPECULAR: + case MT_EMISSIVE: + { + D3DCOLORVALUE c = *(D3DCOLORVALUE *)value; + + TRACE("%s, value (%.8e %.8e %.8e %.8e).\n", material_tbl[op].name, c.r, c.g, c.b, c.a); + *(D3DCOLORVALUE *)((BYTE *)material + material_tbl[op].offset) = c; + break; + } + default: + WARN("Unknown material parameter %u.\n", op); + break; + } +} + +static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum SHADER_CONSTANT_TYPE op, UINT index, + struct d3dx_parameter *param, void *value_ptr) +{ + static const struct + { + D3DXPARAMETER_TYPE type; + UINT elem_size; + const char *name; + } + const_tbl[] = + { + {D3DXPT_FLOAT, sizeof(float) * 4, "SCT_VSFLOAT"}, + {D3DXPT_BOOL, sizeof(BOOL), "SCT_VSBOOL"}, + {D3DXPT_INT, sizeof(int) * 4, "SCT_VSINT"}, + {D3DXPT_FLOAT, sizeof(float) * 4, "SCT_PSFLOAT"}, + {D3DXPT_BOOL, sizeof(BOOL), "SCT_PSBOOL"}, + {D3DXPT_INT, sizeof(int) * 4, "SCT_PSINT"}, + }; + unsigned int element_count; + + if (op < 0 || op > SCT_PSINT) + { + FIXME("Unknown op %u.\n", op); + return D3DERR_INVALIDCALL; + } + element_count = param->bytes / const_tbl[op].elem_size; + TRACE("%s, index %u, element_count %u.\n", const_tbl[op].name, index, element_count); + if (param->type != const_tbl[op].type) + { + FIXME("Unexpected param type %u.\n", param->type); + return D3DERR_INVALIDCALL; + } + if (param->bytes % const_tbl[op].elem_size != 0) + { + FIXME("Unexpected param size %u, rows %u, cols %u.\n", param->bytes, param->rows, param->columns); + return D3DERR_INVALIDCALL; + } + + switch (op) + { + case SCT_VSFLOAT: + return SET_D3D_STATE(effect, SetVertexShaderConstantF, index, (const float *)value_ptr, element_count); + case SCT_VSBOOL: + return SET_D3D_STATE(effect, SetVertexShaderConstantB, index, (const BOOL *)value_ptr, element_count); + case SCT_VSINT: + return SET_D3D_STATE(effect, SetVertexShaderConstantI, index, (const int *)value_ptr, element_count); + case SCT_PSFLOAT: + return SET_D3D_STATE(effect, SetPixelShaderConstantF, index, (const float *)value_ptr, element_count); + case SCT_PSBOOL: + return SET_D3D_STATE(effect, SetPixelShaderConstantB, index, (const BOOL *)value_ptr, element_count); + case SCT_PSINT: + return SET_D3D_STATE(effect, SetPixelShaderConstantI, index, (const int *)value_ptr, element_count); + } + return D3D_OK; +} + +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, + struct d3dx_state *state, unsigned int parent_index, BOOL update_all); + +static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, + struct d3dx_parameter *param, BOOL vs, BOOL update_all) +{ + HRESULT hr, ret; + struct d3dx_parameter **params; + D3DXCONSTANT_DESC *cdesc; + unsigned int parameters_count; + unsigned int i, j; + + if (!param->param_eval) + { + FIXME("param_eval structure is null.\n"); + return D3DERR_INVALIDCALL; + } + if (FAILED(hr = d3dx_param_eval_set_shader_constants(effect->manager, effect->device, + param->param_eval, update_all))) + return hr; + params = param->param_eval->shader_inputs.inputs_param; + cdesc = param->param_eval->shader_inputs.inputs; + parameters_count = param->param_eval->shader_inputs.input_count; + ret = D3D_OK; + for (i = 0; i < parameters_count; ++i) + { + if (params[i] && params[i]->class == D3DXPC_OBJECT && is_param_type_sampler(params[i]->type)) + { + struct d3dx_sampler *sampler; + unsigned int sampler_idx; + + for (sampler_idx = 0; sampler_idx < cdesc[i].RegisterCount; ++sampler_idx) + { + sampler = params[i]->element_count ? params[i]->members[sampler_idx].data : params[i]->data; + TRACE("sampler %s, register index %u, state count %u.\n", debugstr_a(params[i]->name), + cdesc[i].RegisterIndex, sampler->state_count); + for (j = 0; j < sampler->state_count; ++j) + { + if (FAILED(hr = d3dx9_apply_state(effect, pass, &sampler->states[j], + cdesc[i].RegisterIndex + sampler_idx + (vs ? D3DVERTEXTEXTURESAMPLER0 : 0), + update_all))) + ret = hr; + } + } + } + } + return ret; +} + +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, + struct d3dx_state *state, unsigned int parent_index, BOOL update_all) +{ + struct d3dx_parameter *param; + void *param_value; + BOOL param_dirty; + HRESULT hr; + + TRACE("operation %u, index %u, type %u.\n", state->operation, state->index, state->type); + + if (FAILED(hr = d3dx9_get_param_value_ptr(pass, state, &param_value, &param, + update_all, &param_dirty))) + { + if (!update_all && hr == E_FAIL) + { + /* Native d3dx9 returns D3D_OK from CommitChanges() involving + * out of bounds array access and does not touch the affected + * states. */ + WARN("Returning D3D_OK on out of bounds array access.\n"); + return D3D_OK; + } + return hr; + } + + if (!(update_all || param_dirty + || state_table[state->operation].class == SC_VERTEXSHADER + || state_table[state->operation].class == SC_PIXELSHADER + || state_table[state->operation].class == SC_SETSAMPLER)) + return D3D_OK; + + switch (state_table[state->operation].class) + { + case SC_RENDERSTATE: + TRACE("%s, operation %u, value %u.\n", state_table[state->operation].name, + state_table[state->operation].op, *(DWORD *)param_value); + return SET_D3D_STATE(effect, SetRenderState, state_table[state->operation].op, *(DWORD *)param_value); + case SC_FVF: + TRACE("%s, value %#x.\n", state_table[state->operation].name, *(DWORD *)param_value); + return SET_D3D_STATE(effect, SetFVF, *(DWORD *)param_value); + case SC_TEXTURE: + { + UINT unit; + + unit = parent_index == ~0u ? state->index : parent_index; + TRACE("%s, unit %u, value %p.\n", state_table[state->operation].name, unit, + *(IDirect3DBaseTexture9 **)param_value); + return SET_D3D_STATE(effect, SetTexture, unit, *(IDirect3DBaseTexture9 **)param_value); + } + case SC_TEXTURESTAGE: + TRACE("%s, stage %u, value %u.\n", state_table[state->operation].name, state->index, *(DWORD *)param_value); + return SET_D3D_STATE(effect, SetTextureStageState, state->index, + state_table[state->operation].op, *(DWORD *)param_value); + case SC_SETSAMPLER: + { + struct d3dx_sampler *sampler; + HRESULT ret, hr; + unsigned int i; + + sampler = (struct d3dx_sampler *)param_value; + TRACE("%s, sampler %u, applying %u states.\n", state_table[state->operation].name, state->index, + sampler->state_count); + ret = D3D_OK; + for (i = 0; i < sampler->state_count; i++) + { + if (FAILED(hr = d3dx9_apply_state(effect, pass, &sampler->states[i], state->index, update_all))) + ret = hr; + } + return ret; + } + case SC_SAMPLERSTATE: + { + UINT sampler; + + sampler = parent_index == ~0u ? state->index : parent_index; + TRACE("%s, sampler %u, value %u.\n", state_table[state->operation].name, sampler, *(DWORD *)param_value); + return SET_D3D_STATE(effect, SetSamplerState, sampler, state_table[state->operation].op, + *(DWORD *)param_value); + } + case SC_VERTEXSHADER: + TRACE("%s, shader %p.\n", state_table[state->operation].name, *(IDirect3DVertexShader9 **)param_value); + if ((update_all || param_dirty) + && FAILED(hr = SET_D3D_STATE(effect, SetVertexShader, + *(IDirect3DVertexShader9 **)param_value))) + ERR("Could not set vertex shader, hr %#x.\n", hr); + else if (*(IDirect3DVertexShader9 **)param_value) + hr = d3dx_set_shader_constants(effect, pass, param, TRUE, update_all || param_dirty); + return hr; + case SC_PIXELSHADER: + TRACE("%s, shader %p.\n", state_table[state->operation].name, *(IDirect3DPixelShader9 **)param_value); + if ((update_all || param_dirty) + && FAILED(hr = SET_D3D_STATE(effect, SetPixelShader, + *(IDirect3DPixelShader9 **)param_value))) + ERR("Could not set pixel shader, hr %#x.\n", hr); + else if (*(IDirect3DPixelShader9 **)param_value) + hr = d3dx_set_shader_constants(effect, pass, param, FALSE, update_all || param_dirty); + return hr; + case SC_TRANSFORM: + TRACE("%s, state %u.\n", state_table[state->operation].name, state->index); + return SET_D3D_STATE(effect, SetTransform, state_table[state->operation].op + state->index, + (D3DMATRIX *)param_value); + case SC_LIGHTENABLE: + TRACE("%s, index %u, value %u.\n", state_table[state->operation].name, state->index, *(BOOL *)param_value); + return SET_D3D_STATE(effect, LightEnable, state->index, *(BOOL *)param_value); + case SC_LIGHT: + { + TRACE("%s, index %u, op %u.\n", state_table[state->operation].name, state->index, + state_table[state->operation].op); + d3dx9_set_light_parameter(state_table[state->operation].op, + &effect->current_light[state->index], param_value); + effect->light_updated |= 1u << state->index; + return D3D_OK; + } + case SC_MATERIAL: + { + TRACE("%s, index %u, op %u.\n", state_table[state->operation].name, state->index, + state_table[state->operation].op); + d3dx9_set_material_parameter(state_table[state->operation].op, + &effect->current_material, param_value); + effect->material_updated = TRUE; + return D3D_OK; + } + case SC_NPATCHMODE: + TRACE("%s, nsegments %f.\n", state_table[state->operation].name, *(float *)param_value); + return SET_D3D_STATE(effect, SetNPatchMode, *(float *)param_value); + case SC_SHADERCONST: + TRACE("%s, index %u, op %u.\n", state_table[state->operation].name, state->index, + state_table[state->operation].op); + return d3dx_set_shader_const_state(effect, state_table[state->operation].op, state->index, + param, param_value); + default: + FIXME("%s not handled.\n", state_table[state->operation].name); + break; + } + return D3D_OK; +} + +static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, BOOL update_all) +{ + unsigned int i; + HRESULT ret; + HRESULT hr; + ULONG64 new_update_version = next_effect_update_version(&effect->base_effect); + + TRACE("effect %p, pass %p, state_count %u.\n", effect, pass, pass->state_count); + + ret = D3D_OK; + for (i = 0; i < pass->state_count; ++i) + { + if (FAILED(hr = d3dx9_apply_state(effect, pass, &pass->states[i], ~0u, update_all))) + { + WARN("Error applying state, hr %#x.\n", hr); + ret = hr; + } + } + + if (effect->light_updated) + { + for (i = 0; i < ARRAY_SIZE(effect->current_light); ++i) + { + if ((effect->light_updated & (1u << i)) + && FAILED(hr = SET_D3D_STATE(effect, SetLight, i, &effect->current_light[i]))) + { + WARN("Error setting light, hr %#x.\n", hr); + ret = hr; + } + } + effect->light_updated = 0; + } + + if (effect->material_updated + && FAILED(hr = SET_D3D_STATE(effect, SetMaterial, &effect->current_material))) + { + WARN("Error setting material, hr %#x.\n", hr); + ret = hr; + } + effect->material_updated = FALSE; + + pass->update_version = new_update_version; + return ret; +} + +static void param_set_data_pointer(struct d3dx_parameter *param, unsigned char *data, BOOL child, BOOL free_data) +{ + unsigned char *member_data = data; + unsigned int i, count; + + count = param->element_count ? param->element_count : param->member_count; + for (i = 0; i < count; ++i) + { + param_set_data_pointer(&param->members[i], member_data, TRUE, free_data); + if (data) + member_data += param->members[i].bytes; + } + if (free_data) + free_parameter_data(param, child); + param->data = data; +} + +static BOOL is_same_parameter(void *param1_, struct d3dx_parameter *param2) +{ + struct d3dx_parameter *param1 = (struct d3dx_parameter *)param1_; + BOOL matches; + unsigned int i, member_count; + + matches = !strcmp(param1->name, param2->name) && param1->class == param2->class + && param1->type == param2->type && param1->rows == param2->rows + && param1->columns == param2->columns && param1->element_count == param2->element_count + && param1->member_count == param2->member_count; + + member_count = param1->element_count ? param1->element_count : param1->member_count; + + if (!matches || !member_count) + return matches; + + for (i = 0; i < member_count; ++i) + { + if (!is_same_parameter(&param1->members[i], &param2->members[i])) + return FALSE; + } + return TRUE; +} + +static HRESULT d3dx_pool_sync_shared_parameter(struct d3dx_effect_pool *pool, struct d3dx_top_level_parameter *param) +{ + unsigned int i, free_entry_index; + unsigned int new_size, new_count; + + if (!(param->param.flags & PARAMETER_FLAG_SHARED) || !pool || is_param_type_sampler(param->param.type)) + return D3D_OK; + + free_entry_index = pool->size; + for (i = 0; i < pool->size; ++i) + { + if (!pool->shared_data[i].count) + free_entry_index = i; + else if (is_same_parameter(&param->param, &pool->shared_data[i].parameters[0]->param)) + break; + } + if (i == pool->size) + { + i = free_entry_index; + if (i == pool->size) + { + struct d3dx_shared_data *new_alloc; + + if (!pool->size) + { + new_size = INITIAL_POOL_SIZE; + new_alloc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*pool->shared_data) * new_size); + if (!new_alloc) + { + ERR("Out of memory.\n"); + return E_OUTOFMEMORY; + } + } + else + { + new_size = pool->size * 2; + new_alloc = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pool->shared_data, + sizeof(*pool->shared_data) * new_size); + if (!new_alloc) + { + ERR("Out of memory.\n"); + return E_OUTOFMEMORY; + } + if (new_alloc != pool->shared_data) + { + unsigned int j, k; + + for (j = 0; j < pool->size; ++j) + for (k = 0; k < new_alloc[j].count; ++k) + new_alloc[j].parameters[k]->shared_data = &new_alloc[j]; + } + } + pool->shared_data = new_alloc; + pool->size = new_size; + } + pool->shared_data[i].data = param->param.data; + } + else + { + param_set_data_pointer(&param->param, pool->shared_data[i].data, FALSE, TRUE); + } + new_count = ++pool->shared_data[i].count; + if (new_count >= pool->shared_data[i].size) + { + if (!pool->shared_data[i].size) + { + new_size = INITIAL_SHARED_DATA_SIZE; + pool->shared_data[i].parameters = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*pool->shared_data[i].parameters) * INITIAL_SHARED_DATA_SIZE); + } + else + { + new_size = pool->shared_data[i].size * 2; + pool->shared_data[i].parameters = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + pool->shared_data[i].parameters, + sizeof(*pool->shared_data[i].parameters) * new_size); + } + pool->shared_data[i].size = new_size; + } + + param->shared_data = &pool->shared_data[i]; + pool->shared_data[i].parameters[new_count - 1] = param; + + TRACE("name %s, parameter idx %u, new refcount %u.\n", debugstr_a(param->param.name), i, + new_count); + + return D3D_OK; +} + +static BOOL param_zero_data_func(void *dummy, struct d3dx_parameter *param) +{ + param->data = NULL; + return FALSE; +} + +static void d3dx_pool_release_shared_parameter(struct d3dx_top_level_parameter *param) +{ + unsigned int new_count; + + if (!(param->param.flags & PARAMETER_FLAG_SHARED) || !param->shared_data) + return; + new_count = --param->shared_data->count; + + TRACE("param %p, param->shared_data %p, new_count %d.\n", param, param->shared_data, new_count); + + if (new_count) + { + unsigned int i; + + for (i = 0; i < new_count; ++i) + { + if (param->shared_data->parameters[i] == param) + { + memmove(&param->shared_data->parameters[i], + &param->shared_data->parameters[i + 1], + sizeof(param->shared_data->parameters[i]) * (new_count - i)); + break; + } + } + walk_parameter_tree(&param->param, param_zero_data_func, NULL); + } + else + { + HeapFree(GetProcessHeap(), 0, param->shared_data->parameters); + /* Zeroing table size is required as the entry in pool parameters table can be reused. */ + param->shared_data->size = 0; + param->shared_data = NULL; } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, UINT start, UINT end) +static inline struct d3dx_effect_pool *impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) { - FIXME("stub!\n"); - - return E_NOTIMPL; + return CONTAINING_RECORD(iface, struct d3dx_effect_pool, ID3DXEffectPool_iface); } static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) @@ -2497,8 +3324,7 @@ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_ID3DXEffect) || - IsEqualGUID(riid, &IID_ID3DXEffect26)) + IsEqualGUID(riid, &IID_ID3DXEffect)) { iface->lpVtbl->AddRef(iface); *object = iface; @@ -3156,19 +3982,132 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, return S_FALSE; } -static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) +static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func, + void *data); + +static BOOL walk_param_eval_dep(struct d3dx_param_eval *param_eval, walk_parameter_dep_func param_func, + void *data) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_parameter **params; + unsigned int i, param_count; + + if (!param_eval) + return FALSE; + + params = param_eval->shader_inputs.inputs_param; + param_count = param_eval->shader_inputs.input_count; + for (i = 0; i < param_count; ++i) + { + if (walk_parameter_dep(params[i], param_func, data)) + return TRUE; + } + + params = param_eval->pres.inputs.inputs_param; + param_count = param_eval->pres.inputs.input_count; + for (i = 0; i < param_count; ++i) + { + if (walk_parameter_dep(params[i], param_func, data)) + return TRUE; + } + return FALSE; +} + +static BOOL walk_state_dep(struct d3dx_state *state, walk_parameter_dep_func param_func, + void *data) +{ + if (state->type == ST_CONSTANT && is_param_type_sampler(state->parameter.type)) + { + if (walk_parameter_dep(&state->parameter, param_func, data)) + return TRUE; + } + else if (state->type == ST_ARRAY_SELECTOR || state->type == ST_PARAMETER) + { + if (walk_parameter_dep(state->referenced_param, param_func, data)) + return TRUE; + } + return walk_param_eval_dep(state->parameter.param_eval, param_func, data); +} + +static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func, + void *data) +{ + unsigned int i; + unsigned int member_count; + + param = &param->top_level_param->param; + if (param_func(data, param)) + return TRUE; + + if (walk_param_eval_dep(param->param_eval, param_func, data)) + return TRUE; + + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + struct d3dx_sampler *sampler; + unsigned int sampler_idx; + unsigned int samplers_count = max(param->element_count, 1); + + for (sampler_idx = 0; sampler_idx < samplers_count; ++sampler_idx) + { + sampler = param->element_count ? param->members[sampler_idx].data : param->data; + for (i = 0; i < sampler->state_count; ++i) + { + if (walk_state_dep(&sampler->states[i], param_func, data)) + return TRUE; + } + } + return FALSE; + } - FIXME("(%p)->(%p, %p): stub\n", This, parameter, technique); + member_count = param->element_count ? param->element_count : param->member_count; + for (i = 0; i < member_count; ++i) + { + if (walk_param_eval_dep(param->members[i].param_eval, param_func, data)) + return TRUE; + } + + return FALSE; +} + +static BOOL is_parameter_used(struct d3dx_parameter *param, struct d3dx_technique *tech) +{ + unsigned int i, j; + struct d3dx_pass *pass; + + if (!tech || !param) + return FALSE; + for (i = 0; i < tech->pass_count; ++i) + { + pass = &tech->passes[i]; + for (j = 0; j < pass->state_count; ++j) + { + if (walk_state_dep(&pass->states[j], is_same_parameter, param)) + return TRUE; + } + } return FALSE; } +static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) +{ + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); + BOOL ret; + + TRACE("iface %p, parameter %p, technique %p.\n", iface, parameter, technique); + TRACE("param %p, name %s, tech %p.\n", param, param ? debugstr_a(param->name) : "", tech); + + ret = is_parameter_used(param, tech); + TRACE("Returning %#x.\n", ret); + return ret; +} + static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - struct d3dx_technique *technique = This->active_technique; + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p, passes %p, flags %#x.\n", iface, passes, flags); @@ -3177,18 +4116,36 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE)) WARN("Invalid flags (%#x) specified.\n", flags); - if (This->manager || flags & D3DXFX_DONOTSAVESTATE) + if (flags & D3DXFX_DONOTSAVESTATE) { TRACE("State capturing disabled.\n"); } else { - FIXME("State capturing not supported, yet!\n"); + HRESULT hr; + unsigned int i; + + if (!technique->saved_state) + { + ID3DXEffectStateManager *manager; + + manager = effect->manager; + effect->manager = NULL; + if (FAILED(hr = IDirect3DDevice9_BeginStateBlock(effect->device))) + ERR("BeginStateBlock failed, hr %#x.\n", hr); + for (i = 0; i < technique->pass_count; i++) + d3dx9_apply_pass_states(effect, &technique->passes[i], TRUE); + if (FAILED(hr = IDirect3DDevice9_EndStateBlock(effect->device, &technique->saved_state))) + ERR("EndStateBlock failed, hr %#x.\n", hr); + effect->manager = manager; + } + if (FAILED(hr = IDirect3DStateBlock9_Capture(technique->saved_state))) + ERR("StateBlock Capture failed, hr %#x.\n", hr); } *passes = technique->pass_count; - This->started = TRUE; - This->flags = flags; + effect->started = TRUE; + effect->begin_flags = flags; return D3D_OK; } @@ -3200,18 +4157,21 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - struct d3dx_technique *technique = This->active_technique; + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *technique = effect->active_technique; - TRACE("iface %p, pass %u\n", This, pass); + TRACE("iface %p, pass %u\n", effect, pass); - if (technique && pass < technique->pass_count && !This->active_pass) + if (technique && pass < technique->pass_count && !effect->active_pass) { - This->active_pass = &technique->passes[pass]; + HRESULT hr; - FIXME("No states applied, yet!\n"); + memset(effect->current_light, 0, sizeof(effect->current_light)); + memset(&effect->current_material, 0, sizeof(effect->current_material)); - return D3D_OK; + if (SUCCEEDED(hr = d3dx9_apply_pass_states(effect, &technique->passes[pass], TRUE))) + effect->active_pass = &technique->passes[pass]; + return hr; } WARN("Invalid argument supplied.\n"); @@ -3219,19 +4179,18 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) +static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("iface %p.\n", iface); - if (!This->active_pass) + if (!effect->active_pass) { WARN("Called without an active pass.\n"); return D3D_OK; } - - return E_NOTIMPL; + return d3dx9_apply_pass_states(effect, effect->active_pass, FALSE); } static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) @@ -3253,23 +4212,32 @@ static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p.\n", iface); - if (!This->started) + if (!effect->started) return D3D_OK; - if (This->manager || This->flags & D3DXFX_DONOTSAVESTATE) + if (effect->begin_flags & D3DXFX_DONOTSAVESTATE) { TRACE("State restoring disabled.\n"); } else { - FIXME("State restoring not supported, yet!\n"); + HRESULT hr; + + if (technique && technique->saved_state) + { + if (FAILED(hr = IDirect3DStateBlock9_Apply(technique->saved_state))) + ERR("State block apply failed, hr %#x.\n", hr); + } + else + ERR("No saved state.\n"); } - This->started = FALSE; + effect->started = FALSE; return D3D_OK; } @@ -3372,6 +4340,7 @@ static HRESULT WINAPI ID3DXEffectImpl_ApplyParameterBlock(ID3DXEffect* iface, D3 return E_NOTIMPL; } +#if _D3DX9_VER >= 26 static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D3DXHANDLE parameter_block) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); @@ -3380,6 +4349,7 @@ static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D return E_NOTIMPL; } +#endif static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, struct IDirect3DDevice9 *device, struct ID3DXEffect **effect) @@ -3396,6 +4366,7 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, return S_OK; } +#if _D3DX9_VER >= 27 static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface, D3DXHANDLE parameter, const void *data, UINT byte_offset, UINT bytes) { @@ -3404,6 +4375,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface, return E_NOTIMPL; } +#endif static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl = { @@ -3486,9 +4458,13 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl = ID3DXEffectImpl_BeginParameterBlock, ID3DXEffectImpl_EndParameterBlock, ID3DXEffectImpl_ApplyParameterBlock, +#if _D3DX9_VER >= 26 ID3DXEffectImpl_DeleteParameterBlock, +#endif ID3DXEffectImpl_CloneEffect, +#if _D3DX9_VER >= 27 ID3DXEffectImpl_SetRawValue +#endif }; static inline struct ID3DXEffectCompilerImpl *impl_from_ID3DXEffectCompiler(ID3DXEffectCompiler *iface) @@ -4401,13 +5377,23 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) return D3D_OK; } -static HRESULT d3dx9_copy_data(struct d3dx_object *object, const char **ptr) +static HRESULT d3dx9_copy_data(struct d3dx9_base_effect *base, unsigned int object_id, const char **ptr) { + struct d3dx_object *object = &base->objects[object_id]; + if (object->size || object->data) - FIXME("Object already initialized!\n"); + { + if (object_id) + FIXME("Overwriting object id %u!\n", object_id); + else + TRACE("Overwriting object id 0.\n"); + + HeapFree(GetProcessHeap(), 0, object->data); + object->data = NULL; + } read_dword(ptr, &object->size); - TRACE("Data size: %#x\n", object->size); + TRACE("Data size: %#x.\n", object->size); if (!object->size) return D3D_OK; @@ -4427,59 +5413,9 @@ static HRESULT d3dx9_copy_data(struct d3dx_object *object, const char **ptr) return D3D_OK; } -static void add_param_to_table(struct d3dx9_base_effect *base, struct d3dx_parameter *param) -{ - struct param_table *table = &base->param_table; - - if (table->count >= table->size) - { - unsigned int new_size; - struct d3dx_parameter **new_alloc; - - if (!table->size) - { - new_size = INITIAL_PARAM_TABLE_SIZE; - new_alloc = HeapAlloc(GetProcessHeap(), 0, sizeof(*table->table) * new_size); - if (!new_alloc) - { - ERR("Out of memory.\n"); - return; - } - } - else - { - new_size = table->size * 2; - new_alloc = HeapReAlloc(GetProcessHeap(), 0, table->table, sizeof(*table->table) * new_size); - if (!new_alloc) - { - ERR("Out of memory.\n"); - return; - } - } - table->table = new_alloc; - table->size = new_size; - } - - table->table[table->count++] = param; -} - -static void sync_param_handles(struct d3dx9_base_effect *base) +static void param_set_magic_number(struct d3dx_parameter *param) { - struct param_table *table = &base->param_table; - struct d3dx_parameter **new_alloc; - unsigned int i; - - if (table->count) - { - new_alloc = HeapReAlloc(GetProcessHeap(), 0, table->table, sizeof(*table->table) * table->count); - if (new_alloc) - table->table = new_alloc; - else - ERR("Out of memory.\n"); - } - - for (i = 0; i < table->count; ++i) - table->table[i]->handle = (D3DXHANDLE)&table->table[i]; + memcpy(param->magic_string, parameter_magic_string, sizeof(parameter_magic_string)); } static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct d3dx_parameter *param, @@ -4592,7 +5528,6 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct param->name = parent->name; param->semantic = parent->semantic; param->element_count = 0; - param->annotation_count = 0; param->member_count = parent->member_count; param->bytes = parent->bytes; param->rows = parent->rows; @@ -4616,7 +5551,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct { *ptr = save_ptr; - add_param_to_table(base, &param->members[i]); + param_set_magic_number(&param->members[i]); hr = d3dx9_parse_effect_typedef(base, &param->members[i], data, ptr, param, flags); if (hr != D3D_OK) { @@ -4641,7 +5576,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct for (i = 0; i < param->member_count; ++i) { - add_param_to_table(base, &param->members[i]); + param_set_magic_number(&param->members[i]); hr = d3dx9_parse_effect_typedef(base, &param->members[i], data, ptr, NULL, flags); if (hr != D3D_OK) { @@ -4751,7 +5686,7 @@ err_out: return hr; } -static HRESULT d3dx9_parse_effect_parameter(struct d3dx9_base_effect *base, struct d3dx_parameter *param, +static HRESULT d3dx9_parse_effect_parameter(struct d3dx9_base_effect *base, struct d3dx_top_level_parameter *param, const char *data, const char **ptr, struct d3dx_object *objects) { DWORD offset; @@ -4760,29 +5695,29 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx9_base_effect *base, stru const char *ptr2; read_dword(ptr, &offset); - TRACE("Typedef offset: %#x\n", offset); + TRACE("Typedef offset: %#x.\n", offset); ptr2 = data + offset; read_dword(ptr, &offset); - TRACE("Value offset: %#x\n", offset); + TRACE("Value offset: %#x.\n", offset); - read_dword(ptr, &param->flags); - TRACE("Flags: %#x\n", param->flags); + read_dword(ptr, &param->param.flags); + TRACE("Flags: %#x.\n", param->param.flags); read_dword(ptr, &param->annotation_count); - TRACE("Annotation count: %u\n", param->annotation_count); + TRACE("Annotation count: %u.\n", param->annotation_count); - hr = d3dx9_parse_effect_typedef(base, param, data, &ptr2, NULL, param->flags); + hr = d3dx9_parse_effect_typedef(base, &param->param, data, &ptr2, NULL, param->param.flags); if (hr != D3D_OK) { - WARN("Failed to parse type definition\n"); + WARN("Failed to parse type definition.\n"); return hr; } - hr = d3dx9_parse_init_value(base, param, data, data + offset, objects); + hr = d3dx9_parse_init_value(base, &param->param, data, data + offset, objects); if (hr != D3D_OK) { - WARN("Failed to parse value\n"); + WARN("Failed to parse value.\n"); return hr; } @@ -4792,18 +5727,18 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx9_base_effect *base, stru sizeof(*param->annotations) * param->annotation_count); if (!param->annotations) { - ERR("Out of memory\n"); + ERR("Out of memory.\n"); hr = E_OUTOFMEMORY; goto err_out; } for (i = 0; i < param->annotation_count; ++i) { - add_param_to_table(base, &param->annotations[i]); + param_set_magic_number(&param->annotations[i]); hr = d3dx9_parse_effect_annotation(base, &param->annotations[i], data, ptr, objects); if (hr != D3D_OK) { - WARN("Failed to parse annotation\n"); + WARN("Failed to parse annotation.\n"); goto err_out; } } @@ -4861,7 +5796,7 @@ static HRESULT d3dx9_parse_effect_pass(struct d3dx9_base_effect *base, struct d3 for (i = 0; i < pass->annotation_count; ++i) { - add_param_to_table(base, &pass->annotations[i]); + param_set_magic_number(&pass->annotations[i]); hr = d3dx9_parse_effect_annotation(base, &pass->annotations[i], data, ptr, objects); if (hr != D3D_OK) { @@ -4957,7 +5892,7 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx9_base_effect *base, stru for (i = 0; i < technique->annotation_count; ++i) { - add_param_to_table(base, &technique->annotations[i]); + param_set_magic_number(&technique->annotations[i]); hr = d3dx9_parse_effect_annotation(base, &technique->annotations[i], data, ptr, objects); if (hr != D3D_OK) { @@ -5041,7 +5976,7 @@ static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_o (IDirect3DVertexShader9 **)param->data))) { WARN("Failed to create vertex shader.\n"); - return hr; + return D3D_OK; } break; case D3DXPT_PIXELSHADER: @@ -5049,7 +5984,7 @@ static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_o (IDirect3DPixelShader9 **)param->data))) { WARN("Failed to create pixel shader.\n"); - return hr; + return D3D_OK; } break; default: @@ -5058,19 +5993,22 @@ static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_o return D3D_OK; } -static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct d3dx_parameter *param) +static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct d3dx_state *state, + const char **skip_constants, unsigned int skip_constants_count) { DWORD string_size; + struct d3dx_parameter *param = &state->parameter; struct d3dx_object *object = &base->objects[param->object_id]; char *ptr = object->data; + HRESULT ret; TRACE("Parsing array entry selection state for parameter %p.\n", param); string_size = *(DWORD *)ptr; - param->referenced_param = get_parameter_by_name(base, NULL, ptr + 4); - if (param->referenced_param) + state->referenced_param = get_parameter_by_name(base, NULL, ptr + 4); + if (state->referenced_param) { - TRACE("Mapping to parameter %s.\n", debugstr_a(param->referenced_param->name)); + TRACE("Mapping to parameter %s.\n", debugstr_a(state->referenced_param->name)); } else { @@ -5079,12 +6017,41 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct } TRACE("Unknown DWORD: 0x%.8x.\n", *(DWORD *)(ptr + string_size)); - FIXME("Parse preshader.\n"); + if (string_size % sizeof(DWORD)) + FIXME("Unaligned string_size %u.\n", string_size); + if (FAILED(ret = d3dx_create_param_eval(base, (DWORD *)(ptr + string_size) + 1, + object->size - (string_size + sizeof(DWORD)), D3DXPT_INT, &param->param_eval, + get_version_counter_ptr(base), NULL, 0))) + return ret; + ret = D3D_OK; + param = state->referenced_param; + if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER) + { + unsigned int i; - return D3D_OK; + for (i = 0; i < param->element_count; i++) + { + if (param->members[i].type != param->type) + { + FIXME("Unexpected member parameter type %u, expected %u.\n", param->members[i].type, param->type); + return D3DXERR_INVALIDDATA; + } + if (!param->members[i].param_eval) + { + TRACE("Creating preshader for object %u.\n", param->members[i].object_id); + object = &base->objects[param->members[i].object_id]; + if (FAILED(ret = d3dx_create_param_eval(base, object->data, object->size, param->type, + &param->members[i].param_eval, get_version_counter_ptr(base), + skip_constants, skip_constants_count))) + break; + } + } + } + return ret; } -static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char *data, const char **ptr) +static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char *data, const char **ptr, + const char **skip_constants, unsigned int skip_constants_count) { DWORD technique_index; DWORD index, state_index, usage, element_index; @@ -5119,7 +6086,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * return E_FAIL; } - parameter = &base->parameters[index]; + parameter = &base->parameters[index].param; if (element_index != 0xffffffff) { if (element_index >= parameter->element_count && parameter->element_count != 0) @@ -5128,7 +6095,8 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * return E_FAIL; } - if (parameter->element_count != 0) parameter = &parameter->members[element_index]; + if (parameter->element_count) + parameter = &parameter->members[element_index]; } sampler = parameter->data; @@ -5183,11 +6151,18 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case D3DXPT_VERTEXSHADER: case D3DXPT_PIXELSHADER: state->type = ST_CONSTANT; - if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; if (object->data) - hr = d3dx9_create_object(base, object); + { + if (FAILED(hr = d3dx9_create_object(base, object))) + return hr; + if (FAILED(hr = d3dx_create_param_eval(base, object->data, object->size, param->type, + &param->param_eval, get_version_counter_ptr(base), + skip_constants, skip_constants_count))) + return hr; + } break; case D3DXPT_BOOL: @@ -5195,7 +6170,11 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case D3DXPT_FLOAT: case D3DXPT_STRING: state->type = ST_FXLC; - hr = d3dx9_copy_data(&base->objects[param->object_id], ptr); + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) + return hr; + if (FAILED(hr = d3dx_create_param_eval(base, object->data, object->size, param->type, + &param->param_eval, get_version_counter_ptr(base), NULL, 0))) + return hr; break; default: @@ -5206,14 +6185,28 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case 1: state->type = ST_PARAMETER; - if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; TRACE("Looking for parameter %s.\n", debugstr_a(object->data)); - param->referenced_param = get_parameter_by_name(base, NULL, object->data); - if (param->referenced_param) + state->referenced_param = get_parameter_by_name(base, NULL, object->data); + if (state->referenced_param) { - TRACE("Mapping to parameter %p.\n", param->referenced_param); + struct d3dx_parameter *refpar = state->referenced_param; + + TRACE("Mapping to parameter %p, having object id %u.\n", refpar, refpar->object_id); + if (refpar->type == D3DXPT_VERTEXSHADER || refpar->type == D3DXPT_PIXELSHADER) + { + struct d3dx_object *refobj = &base->objects[refpar->object_id]; + + if (!refpar->param_eval) + { + if (FAILED(hr = d3dx_create_param_eval(base, refobj->data, refobj->size, + refpar->type, &refpar->param_eval, get_version_counter_ptr(base), + skip_constants, skip_constants_count))) + return hr; + } + } } else { @@ -5224,9 +6217,9 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case 2: state->type = ST_ARRAY_SELECTOR; - if (FAILED(hr = d3dx9_copy_data(object, ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; - hr = d3dx9_parse_array_selector(base, param); + hr = d3dx9_parse_array_selector(base, state, skip_constants, skip_constants_count); break; default: @@ -5237,7 +6230,14 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * return hr; } -static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *data, UINT data_size, DWORD start) +static BOOL param_set_top_level_param(void *top_level_param, struct d3dx_parameter *param) +{ + param->top_level_param = top_level_param; + return FALSE; +} + +static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *data, UINT data_size, + DWORD start, const char **skip_constants, unsigned int skip_constants_count) { const char *ptr = data + start; UINT stringcount, resourcecount; @@ -5245,20 +6245,20 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da UINT i; read_dword(&ptr, &base->parameter_count); - TRACE("Parameter count: %u\n", base->parameter_count); + TRACE("Parameter count: %u.\n", base->parameter_count); read_dword(&ptr, &base->technique_count); - TRACE("Technique count: %u\n", base->technique_count); + TRACE("Technique count: %u.\n", base->technique_count); skip_dword_unknown(&ptr, 1); read_dword(&ptr, &base->object_count); - TRACE("Object count: %u\n", base->object_count); + TRACE("Object count: %u.\n", base->object_count); base->objects = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base->objects) * base->object_count); if (!base->objects) { - ERR("Out of memory\n"); + ERR("Out of memory.\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5269,20 +6269,22 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da sizeof(*base->parameters) * base->parameter_count); if (!base->parameters) { - ERR("Out of memory\n"); + ERR("Out of memory.\n"); hr = E_OUTOFMEMORY; goto err_out; } for (i = 0; i < base->parameter_count; ++i) { - add_param_to_table(base, &base->parameters[i]); + param_set_magic_number(&base->parameters[i].param); hr = d3dx9_parse_effect_parameter(base, &base->parameters[i], data, &ptr, base->objects); if (hr != D3D_OK) { - WARN("Failed to parse parameter %u\n", i); + WARN("Failed to parse parameter %u.\n", i); goto err_out; } + walk_parameter_tree(&base->parameters[i].param, param_set_top_level_param, + &base->parameters[i]); } } @@ -5292,7 +6294,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da sizeof(*base->techniques) * base->technique_count); if (!base->techniques) { - ERR("Out of memory\n"); + ERR("Out of memory.\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5303,28 +6305,26 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da hr = d3dx9_parse_effect_technique(base, &base->techniques[i], data, &ptr, base->objects); if (hr != D3D_OK) { - WARN("Failed to parse technique %u\n", i); + WARN("Failed to parse technique %u.\n", i); goto err_out; } } } - sync_param_handles(base); - read_dword(&ptr, &stringcount); - TRACE("String count: %u\n", stringcount); + TRACE("String count: %u.\n", stringcount); read_dword(&ptr, &resourcecount); - TRACE("Resource count: %u\n", resourcecount); + TRACE("Resource count: %u.\n", resourcecount); for (i = 0; i < stringcount; ++i) { DWORD id; read_dword(&ptr, &id); - TRACE("Id: %u\n", id); + TRACE("id: %u.\n", id); - if (FAILED(hr = d3dx9_copy_data(&base->objects[id], &ptr))) + if (FAILED(hr = d3dx9_copy_data(base, id, &ptr))) goto err_out; if (base->objects[id].data) @@ -5336,16 +6336,25 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da for (i = 0; i < resourcecount; ++i) { - TRACE("parse resource %u\n", i); + TRACE("parse resource %u.\n", i); - hr = d3dx9_parse_resource(base, data, &ptr); + hr = d3dx9_parse_resource(base, data, &ptr, skip_constants, skip_constants_count); if (hr != D3D_OK) { - WARN("Failed to parse resource %u\n", i); + WARN("Failed to parse resource %u.\n", i); goto err_out; } } + for (i = 0; i < base->parameter_count; ++i) + { + if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &base->parameters[i]))) + goto err_out; + base->parameters[i].version_counter = base->pool + ? &base->pool->version_counter + : &base->version_counter; + set_dirty(&base->parameters[i].param); + } return D3D_OK; err_out: @@ -5362,7 +6371,7 @@ err_out: { for (i = 0; i < base->parameter_count; ++i) { - free_parameter(&base->parameters[i], FALSE, FALSE); + free_top_level_parameter(&base->parameters[i]); } HeapFree(GetProcessHeap(), 0, base->parameters); base->parameters = NULL; @@ -5381,18 +6390,81 @@ err_out: return hr; } +#define INITIAL_CONST_NAMES_SIZE 4 + +static char *next_valid_constant_name(char **string) +{ + char *ret = *string; + char *next; + + while (*ret && !isalpha(*ret) && *ret != '_') + ++ret; + if (!*ret) + return NULL; + + next = ret + 1; + while (isalpha(*next) || isdigit(*next) || *next == '_') + ++next; + if (*next) + *next++ = 0; + *string = next; + return ret; +} + +static const char **parse_skip_constants_string(char *skip_constants_string, unsigned int *names_count) +{ + const char **names, **new_alloc; + const char *name; + char *s; + unsigned int size = INITIAL_CONST_NAMES_SIZE; + + names = HeapAlloc(GetProcessHeap(), 0, sizeof(*names) * size); + if (!names) + return NULL; + + *names_count = 0; + s = skip_constants_string; + while ((name = next_valid_constant_name(&s))) + { + if (*names_count == size) + { + size *= 2; + new_alloc = HeapReAlloc(GetProcessHeap(), 0, names, sizeof(*names) * size); + if (!new_alloc) + { + HeapFree(GetProcessHeap(), 0, names); + return NULL; + } + names = new_alloc; + } + names[(*names_count)++] = name; + } + new_alloc = HeapReAlloc(GetProcessHeap(), 0, names, *names_count * sizeof(*names)); + if (!new_alloc) + return names; + return new_alloc; +} + static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect) + UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect, struct d3dx_effect_pool *pool, + const char *skip_constants_string) { DWORD tag, offset; const char *ptr = data; HRESULT hr; ID3DBlob *bytecode = NULL, *temp_errors = NULL; + char *skip_constants_buffer = NULL; + const char **skip_constants = NULL; + unsigned int skip_constants_count = 0; + unsigned int i, j; - TRACE("base %p, data %p, data_size %lu, effect %p\n", base, data, data_size, effect); + TRACE("base %p, data %p, data_size %lu, effect %p, pool %p, skip_constants %s.\n", + base, data, data_size, effect, pool, debugstr_a(skip_constants_string)); base->effect = effect; + base->pool = pool; + base->flags = eflags; read_dword(&ptr, &tag); TRACE("Tag: %x\n", tag); @@ -5408,7 +6480,22 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, if (bytecode) ID3D10Blob_Release(bytecode); if (temp_errors) - TRACE("%s\n", (char *)ID3D10Blob_GetBufferPointer(temp_errors)); + { + const char *error_string = ID3D10Blob_GetBufferPointer(temp_errors); + const char *string_ptr; + + while (*error_string) + { + string_ptr = error_string; + while (*string_ptr && *string_ptr != '\n' && *string_ptr != '\r' + && string_ptr - error_string < 80) + ++string_ptr; + TRACE("%s\n", debugstr_an(error_string, string_ptr - error_string)); + error_string = string_ptr; + while (*error_string == '\n' || *error_string == '\r') + ++error_string; + } + } if (errors) *errors = temp_errors; else if (temp_errors) @@ -5430,40 +6517,96 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, TRACE("Tag: %x\n", tag); } + if (skip_constants_string) + { + skip_constants_buffer = HeapAlloc(GetProcessHeap(), 0, + sizeof(*skip_constants_buffer) * (strlen(skip_constants_string) + 1)); + if (!skip_constants_buffer) + { + if (bytecode) + ID3D10Blob_Release(bytecode); + return E_OUTOFMEMORY; + } + strcpy(skip_constants_buffer, skip_constants_string); + + if (!(skip_constants = parse_skip_constants_string(skip_constants_buffer, &skip_constants_count))) + { + HeapFree(GetProcessHeap(), 0, skip_constants_buffer); + if (bytecode) + ID3D10Blob_Release(bytecode); + return E_OUTOFMEMORY; + } + } read_dword(&ptr, &offset); TRACE("Offset: %x\n", offset); - hr = d3dx9_parse_effect(base, ptr, data_size, offset); + hr = d3dx9_parse_effect(base, ptr, data_size, offset, skip_constants, skip_constants_count); if (bytecode) ID3D10Blob_Release(bytecode); if (hr != D3D_OK) { FIXME("Failed to parse effect.\n"); + HeapFree(GetProcessHeap(), 0, skip_constants_buffer); + HeapFree(GetProcessHeap(), 0, skip_constants); return hr; } + for (i = 0; i < skip_constants_count; ++i) + { + struct d3dx_parameter *param; + param = get_parameter_by_name(base, NULL, skip_constants[i]); + if (param) + { + for (j = 0; j < base->technique_count; ++j) + { + if (is_parameter_used(param, &base->techniques[j])) + { + WARN("skip_constants parameter %s is used in technique %u.\n", + debugstr_a(skip_constants[i]), j); + HeapFree(GetProcessHeap(), 0, skip_constants_buffer); + HeapFree(GetProcessHeap(), 0, skip_constants); + d3dx9_base_effect_cleanup(base); + return D3DERR_INVALIDCALL; + } + } + } + else + { + TRACE("skip_constants parameter %s not found.\n", + debugstr_a(skip_constants[i])); + } + } + + HeapFree(GetProcessHeap(), 0, skip_constants_buffer); + HeapFree(GetProcessHeap(), 0, skip_constants); + return D3D_OK; } static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3DDevice9 *device, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT eflags, ID3DBlob **error_messages, struct ID3DXEffectPool *pool) + UINT eflags, ID3DBlob **error_messages, struct ID3DXEffectPool *pool, const char *skip_constants) { HRESULT hr; + struct d3dx_effect_pool *pool_impl = NULL; TRACE("effect %p, device %p, data %p, data_size %lu, pool %p\n", effect, device, data, data_size, pool); effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; - if (pool) pool->lpVtbl->AddRef(pool); + if (pool) + { + pool->lpVtbl->AddRef(pool); + pool_impl = impl_from_ID3DXEffectPool(pool); + } effect->pool = pool; IDirect3DDevice9_AddRef(device); effect->device = device; if (FAILED(hr = d3dx9_base_effect_init(&effect->base_effect, data, data_size, defines, include, - eflags, error_messages, effect))) + eflags, error_messages, effect, pool_impl, skip_constants))) { FIXME("Failed to parse effect, hr %#x.\n", hr); free_effect(effect); @@ -5505,15 +6648,12 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (!effect) return D3D_OK; - if (skip_constants) - FIXME("skip_constants is not NULL, not supported yet.\n"); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; hr = d3dx9_effect_init(object, device, srcdata, srcdatalen, (const D3D_SHADER_MACRO *)defines, - (ID3DInclude *)include, flags, (ID3DBlob **)compilation_errors, pool); + (ID3DInclude *)include, flags, (ID3DBlob **)compilation_errors, pool, skip_constants); if (FAILED(hr)) { WARN("Failed to create effect object.\n"); @@ -5550,7 +6690,7 @@ static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compil compiler->ref = 1; if (FAILED(hr = d3dx9_base_effect_init(&compiler->base_effect, data, data_size, defines, - include, eflags, error_messages, NULL))) + include, eflags, error_messages, NULL, NULL, NULL))) { FIXME("Failed to parse effect, hr %#x.\n", hr); free_effect_compiler(compiler); @@ -5595,21 +6735,10 @@ HRESULT WINAPI D3DXCreateEffectCompiler(const char *srcdata, UINT srcdatalen, co return D3D_OK; } -struct ID3DXEffectPoolImpl -{ - ID3DXEffectPool ID3DXEffectPool_iface; - LONG ref; -}; - -static inline struct ID3DXEffectPoolImpl *impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) -{ - return CONTAINING_RECORD(iface, struct ID3DXEffectPoolImpl, ID3DXEffectPool_iface); -} - /*** IUnknown methods ***/ -static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool *iface, REFIID riid, void **object) +static HRESULT WINAPI d3dx_effect_pool_QueryInterface(ID3DXEffectPool *iface, REFIID riid, void **object) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXEffectPool)) @@ -5624,41 +6753,69 @@ static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool *iface, return E_NOINTERFACE; } -static ULONG WINAPI ID3DXEffectPoolImpl_AddRef(ID3DXEffectPool *iface) +static ULONG WINAPI d3dx_effect_pool_AddRef(ID3DXEffectPool *iface) { - struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); + struct d3dx_effect_pool *pool = impl_from_ID3DXEffectPool(iface); + ULONG refcount = InterlockedIncrement(&pool->refcount); - TRACE("(%p)->(): AddRef from %u\n", This, This->ref); + TRACE("%p increasing refcount to %u.\n", pool, refcount); - return InterlockedIncrement(&This->ref); + return refcount; } -static ULONG WINAPI ID3DXEffectPoolImpl_Release(ID3DXEffectPool *iface) +static void free_effect_pool(struct d3dx_effect_pool *pool) { - struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); - ULONG ref = InterlockedDecrement(&This->ref); + unsigned int i; - TRACE("(%p)->(): Release from %u\n", This, ref + 1); + for (i = 0; i < pool->size; ++i) + { + if (pool->shared_data[i].count) + { + unsigned int j; - if (!ref) - HeapFree(GetProcessHeap(), 0, This); + WARN("Releasing pool with referenced parameters.\n"); - return ref; + param_set_data_pointer(&pool->shared_data[i].parameters[0]->param, NULL, FALSE, TRUE); + pool->shared_data[i].parameters[0]->shared_data = NULL; + + for (j = 1; j < pool->shared_data[i].count; ++j) + { + walk_parameter_tree(&pool->shared_data[i].parameters[j]->param, param_zero_data_func, NULL); + pool->shared_data[i].parameters[j]->shared_data = NULL; + } + HeapFree(GetProcessHeap(), 0, pool->shared_data[i].parameters); + } + } + HeapFree(GetProcessHeap(), 0, pool->shared_data); + HeapFree(GetProcessHeap(), 0, pool); +} + +static ULONG WINAPI d3dx_effect_pool_Release(ID3DXEffectPool *iface) +{ + struct d3dx_effect_pool *pool = impl_from_ID3DXEffectPool(iface); + ULONG refcount = InterlockedDecrement(&pool->refcount); + + TRACE("%p decreasing refcount to %u.\n", pool, refcount); + + if (!refcount) + free_effect_pool(pool); + + return refcount; } static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl = { /*** IUnknown methods ***/ - ID3DXEffectPoolImpl_QueryInterface, - ID3DXEffectPoolImpl_AddRef, - ID3DXEffectPoolImpl_Release + d3dx_effect_pool_QueryInterface, + d3dx_effect_pool_AddRef, + d3dx_effect_pool_Release }; HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool) { - struct ID3DXEffectPoolImpl *object; + struct d3dx_effect_pool *object; - TRACE("(%p)\n", pool); + TRACE("pool %p.\n", pool); if (!pool) return D3DERR_INVALIDCALL; @@ -5668,7 +6825,7 @@ HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool) return E_OUTOFMEMORY; object->ID3DXEffectPool_iface.lpVtbl = &ID3DXEffectPool_Vtbl; - object->ref = 1; + object->refcount = 1; *pool = &object->ID3DXEffectPool_iface; diff --git a/dll/directx/wine/d3dx9_36/math.c b/dll/directx/wine/d3dx9_36/math.c index 1bfb8cc3db..2f5a473081 100644 --- a/dll/directx/wine/d3dx9_36/math.c +++ b/dll/directx/wine/d3dx9_36/math.c @@ -1371,19 +1371,16 @@ D3DXQUATERNION * WINAPI D3DXQuaternionExp(D3DXQUATERNION *out, const D3DXQUATERN D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, const D3DXQUATERNION *pq) { - D3DXQUATERNION out; FLOAT norm; TRACE("pout %p, pq %p\n", pout, pq); norm = D3DXQuaternionLengthSq(pq); - out.x = -pq->x / norm; - out.y = -pq->y / norm; - out.z = -pq->z / norm; - out.w = pq->w / norm; - - *pout =out; + pout->x = -pq->x / norm; + pout->y = -pq->y / norm; + pout->z = -pq->z / norm; + pout->w = pq->w / norm; return pout; } @@ -1585,6 +1582,7 @@ static D3DXQUATERNION add_diff(const D3DXQUATERNION *q1, const D3DXQUATERNION *q void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbout, D3DXQUATERNION *pcout, const D3DXQUATERNION *pq0, const D3DXQUATERNION *pq1, const D3DXQUATERNION *pq2, const D3DXQUATERNION *pq3) { D3DXQUATERNION q, temp1, temp2, temp3, zero; + D3DXQUATERNION aout, cout; TRACE("paout %p, pbout %p, pcout %p, pq0 %p, pq1 %p, pq2 %p, pq3 %p\n", paout, pbout, pcout, pq0, pq1, pq2, pq3); @@ -1593,17 +1591,17 @@ void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbou zero.z = 0.0f; zero.w = 0.0f; - if ( D3DXQuaternionDot(pq0, pq1) < 0.0f ) + if (D3DXQuaternionDot(pq0, pq1) < 0.0f) temp2 = add_diff(&zero, pq0, -1.0f); else temp2 = *pq0; - if ( D3DXQuaternionDot(pq1, pq2) < 0.0f ) - *pcout = add_diff(&zero, pq2, -1.0f); + if (D3DXQuaternionDot(pq1, pq2) < 0.0f) + cout = add_diff(&zero, pq2, -1.0f); else - *pcout = *pq2; + cout = *pq2; - if ( D3DXQuaternionDot(pcout, pq3) < 0.0f ) + if (D3DXQuaternionDot(&cout, pq3) < 0.0f) temp3 = add_diff(&zero, pq3, -1.0f); else temp3 = *pq3; @@ -1611,7 +1609,7 @@ void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbou D3DXQuaternionInverse(&temp1, pq1); D3DXQuaternionMultiply(&temp2, &temp1, &temp2); D3DXQuaternionLn(&temp2, &temp2); - D3DXQuaternionMultiply(&q, &temp1, pcout); + D3DXQuaternionMultiply(&q, &temp1, &cout); D3DXQuaternionLn(&q, &q); temp1 = add_diff(&temp2, &q, 1.0f); temp1.x *= -0.25f; @@ -1619,9 +1617,9 @@ void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbou temp1.z *= -0.25f; temp1.w *= -0.25f; D3DXQuaternionExp(&temp1, &temp1); - D3DXQuaternionMultiply(paout, pq1, &temp1); + D3DXQuaternionMultiply(&aout, pq1, &temp1); - D3DXQuaternionInverse(&temp1, pcout); + D3DXQuaternionInverse(&temp1, &cout); D3DXQuaternionMultiply(&temp2, &temp1, pq1); D3DXQuaternionLn(&temp2, &temp2); D3DXQuaternionMultiply(&q, &temp1, &temp3); @@ -1632,19 +1630,23 @@ void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbou temp1.z *= -0.25f; temp1.w *= -0.25f; D3DXQuaternionExp(&temp1, &temp1); - D3DXQuaternionMultiply(pbout, pcout, &temp1); - - return; + D3DXQuaternionMultiply(pbout, &cout, &temp1); + *paout = aout; + *pcout = cout; } void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle) { TRACE("pq %p, paxis %p, pangle %p\n", pq, paxis, pangle); - paxis->x = pq->x; - paxis->y = pq->y; - paxis->z = pq->z; - *pangle = 2.0f * acosf(pq->w); + if (paxis) + { + paxis->x = pq->x; + paxis->y = pq->y; + paxis->z = pq->z; + } + if (pangle) + *pangle = 2.0f * acosf(pq->w); } /*_________________D3DXVec2_____________________*/ @@ -1706,12 +1708,15 @@ D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv) D3DXVECTOR4* WINAPI D3DXVec2Transform(D3DXVECTOR4 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm) { + D3DXVECTOR4 out; + TRACE("pout %p, pv %p, pm %p\n", pout, pv, pm); - pout->x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[3][0]; - pout->y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[3][1]; - pout->z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[3][2]; - pout->w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[3][3]; + out.x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[3][0]; + out.y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[3][1]; + out.z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[3][2]; + out.w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[3][3]; + *pout = out; return pout; } @@ -1889,12 +1894,15 @@ D3DXVECTOR3* WINAPI D3DXVec3ProjectArray(D3DXVECTOR3* out, UINT outstride, const D3DXVECTOR4* WINAPI D3DXVec3Transform(D3DXVECTOR4 *pout, const D3DXVECTOR3 *pv, const D3DXMATRIX *pm) { + D3DXVECTOR4 out; + TRACE("pout %p, pv %p, pm %p\n", pout, pv, pm); - pout->x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0]; - pout->y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1]; - pout->z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2]; - pout->w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[2][3] * pv->z + pm->u.m[3][3]; + out.x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0]; + out.y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1]; + out.z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2]; + out.w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[2][3] * pv->z + pm->u.m[3][3]; + *pout = out; return pout; } diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c index ff587a63bf..2f9615eed4 100644 --- a/dll/directx/wine/d3dx9_36/mesh.c +++ b/dll/directx/wine/d3dx9_36/mesh.c @@ -35,6 +35,7 @@ #include "dxfile.h" #include "rmxfguid.h" #include "rmxftmpl.h" + #include "wine/list.h" struct d3dx9_mesh @@ -2366,12 +2367,15 @@ BOOL WINAPI D3DXIntersectTri(const D3DXVECTOR3 *p0, const D3DXVECTOR3 *p1, const D3DXMATRIX m; D3DXVECTOR4 vec; + TRACE("p0 %p, p1 %p, p2 %p, praypos %p, praydir %p, pu %p, pv %p, pdist %p.\n", + p0, p1, p2, praypos, praydir, pu, pv, pdist); + m.u.m[0][0] = p1->x - p0->x; m.u.m[1][0] = p2->x - p0->x; m.u.m[2][0] = -praydir->x; m.u.m[3][0] = 0.0f; - m.u.m[0][1] = p1->y - p0->z; - m.u.m[1][1] = p2->y - p0->z; + m.u.m[0][1] = p1->y - p0->y; + m.u.m[1][1] = p2->y - p0->y; m.u.m[2][1] = -praydir->y; m.u.m[3][1] = 0.0f; m.u.m[0][2] = p1->z - p0->z; @@ -5663,7 +5667,6 @@ static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int da pt->corner = POINTTYPE_CURVE_END; } outline->count--; - lastpt = &outline->items[outline->count - 1]; } else { /* outline closed with a line from end to start point */ attempt_line_merge(outline, outline->count - 1, &pt->pos, FALSE, cos_table); @@ -7186,6 +7189,33 @@ cleanup: return hr; } + +/************************************************************************* + * D3DXOptimizeVertices (D3DX9_36.@) + */ +HRESULT WINAPI D3DXOptimizeVertices(const void *indices, UINT num_faces, + UINT num_vertices, BOOL indices_are_32bit, DWORD *vertex_remap) +{ + UINT i; + + FIXME("indices %p, num_faces %u, num_vertices %u, indices_are_32bit %#x, vertex_remap %p semi-stub.\n", + indices, num_faces, num_vertices, indices_are_32bit, vertex_remap); + + if (!vertex_remap) + { + WARN("vertex remap pointer is NULL.\n"); + return D3DERR_INVALIDCALL; + } + + for (i = 0; i < num_vertices; i++) + { + vertex_remap[i] = i; + } + + return D3D_OK; +} + + /************************************************************************* * D3DXOptimizeFaces (D3DX9_36.@) * @@ -7509,6 +7539,24 @@ done: return hr; } +/************************************************************************* + * D3DXComputeTangent (D3DX9_36.@) + */ +HRESULT WINAPI D3DXComputeTangent(ID3DXMesh *mesh, DWORD stage_idx, DWORD tangent_idx, + DWORD binorm_idx, DWORD wrap, const DWORD *adjacency) +{ + TRACE("mesh %p, stage_idx %d, tangent_idx %d, binorm_idx %d, wrap %d, adjacency %p.\n", + mesh, stage_idx, tangent_idx, binorm_idx, wrap, adjacency); + + return D3DXComputeTangentFrameEx( mesh, D3DDECLUSAGE_TEXCOORD, stage_idx, + ( binorm_idx == D3DX_DEFAULT ) ? D3DX_DEFAULT : D3DDECLUSAGE_BINORMAL, + binorm_idx, + ( tangent_idx == D3DX_DEFAULT ) ? D3DX_DEFAULT : D3DDECLUSAGE_TANGENT, + tangent_idx, D3DX_DEFAULT, 0, + ( wrap ? D3DXTANGENT_WRAP_UV : 0 ) | D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_ORTHOGONALIZE_FROM_U, + adjacency, -1.01f, -0.01f, -1.01f, NULL, NULL); +} + /************************************************************************* * D3DXComputeNormals (D3DX9_36.@) */ diff --git a/dll/directx/wine/d3dx9_36/preshader.c b/dll/directx/wine/d3dx9_36/preshader.c new file mode 100644 index 0000000000..a8a5858950 --- /dev/null +++ b/dll/directx/wine/d3dx9_36/preshader.c @@ -0,0 +1,1764 @@ +/* + * Copyright 2016 Paul Gofman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "d3dx9_36_private.h" + +#include <assert.h> + +/* ReactOS FIXME: Insect */ +#define fmin min +#define fmax max + +enum pres_ops +{ + PRESHADER_OP_NOP, + PRESHADER_OP_MOV, + PRESHADER_OP_NEG, + PRESHADER_OP_RCP, + PRESHADER_OP_FRC, + PRESHADER_OP_EXP, + PRESHADER_OP_LOG, + PRESHADER_OP_RSQ, + PRESHADER_OP_SIN, + PRESHADER_OP_COS, + PRESHADER_OP_ASIN, + PRESHADER_OP_ACOS, + PRESHADER_OP_ATAN, + PRESHADER_OP_MIN, + PRESHADER_OP_MAX, + PRESHADER_OP_LT, + PRESHADER_OP_GE, + PRESHADER_OP_ADD, + PRESHADER_OP_MUL, + PRESHADER_OP_ATAN2, + PRESHADER_OP_DIV, + PRESHADER_OP_CMP, + PRESHADER_OP_DOT, + PRESHADER_OP_DOTSWIZ6, + PRESHADER_OP_DOTSWIZ8, +}; + +typedef double (*pres_op_func)(double *args, int n); + +static double to_signed_nan(double v) +{ + static const union + { + ULONG64 ulong64_value; + double double_value; + } + signed_nan = + { + 0xfff8000000000000 + }; + + return isnan(v) ? signed_nan.double_value : v; +} + +static double pres_mov(double *args, int n) {return args[0];} +static double pres_add(double *args, int n) {return args[0] + args[1];} +static double pres_mul(double *args, int n) {return args[0] * args[1];} +static double pres_dot(double *args, int n) +{ + int i; + double sum; + + sum = 0.0; + for (i = 0; i < n; ++i) + sum += args[i] * args[i + n]; + return sum; +} + +static double pres_dotswiz6(double *args, int n) +{ + return pres_dot(args, 3); +} + +static double pres_dotswiz8(double *args, int n) +{ + return pres_dot(args, 4); +} + +static double pres_neg(double *args, int n) {return -args[0];} +static double pres_rcp(double *args, int n) {return 1.0 / args[0];} +static double pres_lt(double *args, int n) {return args[0] < args[1] ? 1.0 : 0.0;} +static double pres_ge(double *args, int n) {return args[0] >= args[1] ? 1.0 : 0.0;} +static double pres_frc(double *args, int n) {return args[0] - floor(args[0]);} +static double pres_min(double *args, int n) {return fmin(args[0], args[1]);} +static double pres_max(double *args, int n) {return fmax(args[0], args[1]);} +static double pres_cmp(double *args, int n) {return args[0] >= 0.0 ? args[1] : args[2];} +static double pres_sin(double *args, int n) {return sin(args[0]);} +static double pres_cos(double *args, int n) {return cos(args[0]);} +static double pres_rsq(double *args, int n) +{ + double v; + + v = fabs(args[0]); + if (v == 0.0) + return INFINITY; + else + return 1.0 / sqrt(v); +} +static double pres_exp(double *args, int n) {return pow(2.0, args[0]);} +static double pres_log(double *args, int n) +{ + double v; + + v = fabs(args[0]); + if (v == 0.0) + return 0.0; + else +#ifdef HAVE_LOG2 + return log2(v); +#else + return log(v) / log(2); +#endif +} +static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));} +static double pres_acos(double *args, int n) {return to_signed_nan(acos(args[0]));} +static double pres_atan(double *args, int n) {return atan(args[0]);} +static double pres_atan2(double *args, int n) {return atan2(args[0], args[1]);} + +/* According to the test results 'div' operation always returns 0. Compiler does not seem to ever + * generate it, using rcp + mul instead, so probably it is not implemented in native d3dx. */ +static double pres_div(double *args, int n) {return 0.0;} + +#define PRES_OPCODE_MASK 0x7ff00000 +#define PRES_OPCODE_SHIFT 20 +#define PRES_SCALAR_FLAG 0x80000000 +#define PRES_NCOMP_MASK 0x0000ffff + +#define FOURCC_PRES 0x53455250 +#define FOURCC_CLIT 0x54494c43 +#define FOURCC_FXLC 0x434c5846 +#define FOURCC_PRSI 0x49535250 +#define PRES_SIGN 0x46580000 + +struct op_info +{ + unsigned int opcode; + char mnem[16]; + unsigned int input_count; + BOOL func_all_comps; + pres_op_func func; +}; + +static const struct op_info pres_op_info[] = +{ + {0x000, "nop", 0, 0, NULL }, /* PRESHADER_OP_NOP */ + {0x100, "mov", 1, 0, pres_mov}, /* PRESHADER_OP_MOV */ + {0x101, "neg", 1, 0, pres_neg}, /* PRESHADER_OP_NEG */ + {0x103, "rcp", 1, 0, pres_rcp}, /* PRESHADER_OP_RCP */ + {0x104, "frc", 1, 0, pres_frc}, /* PRESHADER_OP_FRC */ + {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ + {0x106, "log", 1, 0, pres_log}, /* PRESHADER_OP_LOG */ + {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ + {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ + {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ + {0x10a, "asin", 1, 0, pres_asin}, /* PRESHADER_OP_ASIN */ + {0x10b, "acos", 1, 0, pres_acos}, /* PRESHADER_OP_ACOS */ + {0x10c, "atan", 1, 0, pres_atan}, /* PRESHADER_OP_ATAN */ + {0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */ + {0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */ + {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ + {0x203, "ge", 2, 0, pres_ge }, /* PRESHADER_OP_GE */ + {0x204, "add", 2, 0, pres_add}, /* PRESHADER_OP_ADD */ + {0x205, "mul", 2, 0, pres_mul}, /* PRESHADER_OP_MUL */ + {0x206, "atan2", 2, 0, pres_atan2}, /* PRESHADER_OP_ATAN2 */ + {0x208, "div", 2, 0, pres_div}, /* PRESHADER_OP_DIV */ + {0x300, "cmp", 3, 0, pres_cmp}, /* PRESHADER_OP_CMP */ + {0x500, "dot", 2, 1, pres_dot}, /* PRESHADER_OP_DOT */ + {0x70e, "d3ds_dotswiz", 6, 0, pres_dotswiz6}, /* PRESHADER_OP_DOTSWIZ6 */ + {0x70e, "d3ds_dotswiz", 8, 0, pres_dotswiz8}, /* PRESHADER_OP_DOTSWIZ8 */ +}; + +enum pres_value_type +{ + PRES_VT_FLOAT, + PRES_VT_DOUBLE, + PRES_VT_INT, + PRES_VT_BOOL, + PRES_VT_COUNT +}; + +static const struct +{ + unsigned int component_size; + enum pres_value_type type; +} +table_info[] = +{ + {sizeof(double), PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */ + {sizeof(float), PRES_VT_FLOAT }, /* PRES_REGTAB_CONST */ + {sizeof(float), PRES_VT_FLOAT }, /* PRES_REGTAB_OCONST */ + {sizeof(BOOL), PRES_VT_BOOL }, /* PRES_REGTAB_OBCONST */ + {sizeof(int), PRES_VT_INT, }, /* PRES_REGTAB_OICONST */ + /* TODO: use double precision for 64 bit */ + {sizeof(float), PRES_VT_FLOAT } /* PRES_REGTAB_TEMP */ +}; + +static const char *table_symbol[] = +{ + "imm", "c", "oc", "ob", "oi", "r", "(null)", +}; + +static const enum pres_reg_tables pres_regset2table[] = +{ + PRES_REGTAB_OBCONST, /* D3DXRS_BOOL */ + PRES_REGTAB_OICONST, /* D3DXRS_INT4 */ + PRES_REGTAB_CONST, /* D3DXRS_FLOAT4 */ + PRES_REGTAB_COUNT, /* D3DXRS_SAMPLER */ +}; + +static const enum pres_reg_tables shad_regset2table[] = +{ + PRES_REGTAB_OBCONST, /* D3DXRS_BOOL */ + PRES_REGTAB_OICONST, /* D3DXRS_INT4 */ + PRES_REGTAB_OCONST, /* D3DXRS_FLOAT4 */ + PRES_REGTAB_COUNT, /* D3DXRS_SAMPLER */ +}; + +struct d3dx_pres_reg +{ + enum pres_reg_tables table; + /* offset is component index, not register index, e. g. ... 3389 lines suppressed ...

1 0

[reactos] 03/03: [MSI_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by Amine Khaldi 08 Oct '17

08 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f8e6f711cba383e981a1… commit 2f8e6f711cba383e981a19d24b5a29a7bb94b616 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 8 09:15:09 2017 +0100 [MSI_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/msi/db.c | 6 + modules/rostests/winetests/msi/format.c | 63 +++ modules/rostests/winetests/msi/msi.c | 18 + modules/rostests/winetests/msi/package.c | 807 ++++++++++++++++++++++++++++++- modules/rostests/winetests/msi/record.c | 19 +- 5 files changed, 893 insertions(+), 20 deletions(-) diff --git a/modules/rostests/winetests/msi/db.c b/modules/rostests/winetests/msi/db.c index 278b45f958..4ea1f10024 100644 --- a/modules/rostests/winetests/msi/db.c +++ b/modules/rostests/winetests/msi/db.c @@ -2369,6 +2369,12 @@ static void test_msiimport(void) r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_CREATE, &hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiDatabaseImportA(hdb, CURR_DIR, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + + r = MsiDatabaseImportA(hdb, CURR_DIR, "nonexistent"); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r); + r = add_table_to_db(hdb, test_data); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); diff --git a/modules/rostests/winetests/msi/format.c b/modules/rostests/winetests/msi/format.c index 8ed4bbbc6e..b476c6b290 100644 --- a/modules/rostests/winetests/msi/format.c +++ b/modules/rostests/winetests/msi/format.c @@ -494,6 +494,15 @@ static void test_formatrecord(void) ok( sz == 7, "size wrong\n"); ok( 0 == strcmp(buffer,"boo hoo"), "wrong output\n"); + /* self-referential format field */ + r = MsiRecordSetStringA(hrec, 0, "[1] test [0]"); + ok( r == ERROR_SUCCESS, "set string failed\n"); + sz = sizeof buffer; + r = MsiFormatRecordA(0, hrec, buffer, &sz); + ok( r == ERROR_SUCCESS, "format failed\n"); + ok( sz == 21, "size wrong\n"); + ok( 0 == strcmp(buffer,"boo test [1] test [0]"), "wrong output\n"); + /* empty string */ r = MsiRecordSetStringA(hrec, 0, ""); ok( r == ERROR_SUCCESS, "set string failed\n"); @@ -504,6 +513,18 @@ static void test_formatrecord(void) ok( 0 == strcmp(buffer,"1: boo 2: hoo 3: 4: 5: 6: "), "wrong output(%s)\n",buffer); + /* empty string with numbers */ + r = MsiRecordSetStringA(hrec, 1, "123"); + ok( r == ERROR_SUCCESS, "set string failed\n"); + r = MsiRecordSetInteger(hrec, 2, 4567); + ok( r == ERROR_SUCCESS, "set string failed\n"); + sz = sizeof buffer; + r = MsiFormatRecordA(0, hrec, buffer, &sz); + ok( r == ERROR_SUCCESS, "format failed\n"); + ok( sz == 31, "size wrong %i\n",sz); + ok( 0 == strcmp(buffer,"1: 123 2: 4567 3: 4: 5: 6: "), + "wrong output(%s)\n",buffer); + /* play games with recursive lookups */ r = MsiRecordSetStringA(hrec, 0, "[[1]] [2]"); ok( r == ERROR_SUCCESS, "set string failed\n"); @@ -2575,6 +2596,12 @@ static void test_formatrecord_tables(void) ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); ok( !lstrcmpA( buf, "1: ringer " ), "Expected '1: ringer ', got %s\n", buf ); + size = MAX_PATH; + MsiRecordSetStringA( hrec, 0, "1: [1] " ); + r = MsiFormatRecordA( hpkg, hrec, buf, &size ); + ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); + ok( !lstrcmpA( buf, "1: ringer " ), "Expected '1: ringer ', got %s\n", buf ); + /* environment variable doesn't exist */ size = MAX_PATH; MsiRecordSetStringA( hrec, 1, "[%idontexist]" ); @@ -2777,6 +2804,42 @@ static void test_processmessage(void) r = MsiProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, hrec); ok( r == IDOK, "expected IDOK, got %i\n", r); + r = MsiProcessMessage(package, INSTALLMESSAGE_PROGRESS, hrec); + ok( r == IDOK, "expected IDOK, got %i\n", r); + + r = MsiProcessMessage(package, INSTALLMESSAGE_INFO, hrec); + ok( r == 0, "expected 0, got %i\n", r); + + r = MsiProcessMessage(package, INSTALLMESSAGE_INITIALIZE, hrec); + ok( r == -1, "expected -1, got %i\n", r); + + r = MsiRecordSetInteger(hrec, 1, 2); + ok( r == ERROR_SUCCESS, "set integer failed\n"); + r = MsiRecordSetInteger(hrec, 2, 1); + ok( r == ERROR_SUCCESS, "set integer failed\n"); + r = MsiProcessMessage(package, INSTALLMESSAGE_COMMONDATA, hrec); + todo_wine + ok( r == IDOK, "expected IDOK, got %i\n", r); + + r = MsiRecordSetInteger(hrec, 2, 2); + ok( r == ERROR_SUCCESS, "set integer failed\n"); + r = MsiProcessMessage(package, INSTALLMESSAGE_COMMONDATA, hrec); + todo_wine + ok( r == IDOK, "expected IDOK, got %i\n", r); + + r = MsiRecordSetInteger(hrec, 1, 1); + ok( r == ERROR_SUCCESS, "set integer failed\n"); + r = MsiProcessMessage(package, INSTALLMESSAGE_COMMONDATA, hrec); + ok( r == -1, "expected -1, got %i\n", r); + + MsiCloseHandle(package); + + MsiSetInternalUI(INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY, NULL); + helper_createpackage(msifile, &package); + + r = MsiProcessMessage(package, INSTALLMESSAGE_ERROR, hrec); + ok( r == 0, "expected 0, got %i\n", r); + MsiCloseHandle(hrec); MsiCloseHandle(package); diff --git a/modules/rostests/winetests/msi/msi.c b/modules/rostests/winetests/msi/msi.c index 1c46581459..6ae7753870 100644 --- a/modules/rostests/winetests/msi/msi.c +++ b/modules/rostests/winetests/msi/msi.c @@ -14348,6 +14348,23 @@ static INT CALLBACK handler_record(LPVOID context, UINT type, MSIHANDLE record) return IDOK; } +static void test_MsiSetInternalUI(void) +{ + INSTALLUILEVEL level; + + level = MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); + ok(level == INSTALLUILEVEL_DEFAULT, "expected INSTALLUILEVEL_DEFAULT, got %d\n", level); + + level = MsiSetInternalUI(INSTALLUILEVEL_DEFAULT, NULL); + ok(level == INSTALLUILEVEL_FULL, "expected INSTALLUILEVEL_FULL, got %d\n", level); + + level = MsiSetInternalUI(INSTALLUILEVEL_NOCHANGE, NULL); + ok(level == INSTALLUILEVEL_DEFAULT, "expected INSTALLUILEVEL_DEFAULT, got %d\n", level); + + level = MsiSetInternalUI(0xdeadbeef, NULL); + ok(level == INSTALLUILEVEL_NOCHANGE, "expected INSTALLUILEVEL_NOCHANGE, got %d\n", level); +} + static void test_MsiSetExternalUI(void) { INSTALLUI_HANDLERA ret_a; @@ -14892,6 +14909,7 @@ START_TEST(msi) test_null(); test_getcomponentpath(); test_MsiGetFileHash(); + test_MsiSetInternalUI(); if (!pConvertSidToStringSidA) win_skip("ConvertSidToStringSidA not implemented\n"); diff --git a/modules/rostests/winetests/msi/package.c b/modules/rostests/winetests/msi/package.c index 10ef84a0ae..c00ed61c18 100644 --- a/modules/rostests/winetests/msi/package.c +++ b/modules/rostests/winetests/msi/package.c @@ -21,6 +21,7 @@ #define COBJMACROS +#include <assert.h> #include <stdio.h> #include <windows.h> #include <msidefs.h> @@ -37,7 +38,6 @@ static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','-','p','a','c','k','a','g','e','.','m','s','i',0}; static char CURR_DIR[MAX_PATH]; -static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA)(LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); @@ -65,7 +65,6 @@ static void init_functionpointers(void) #define GET_PROC(mod, func) \ p ## func = (void*)GetProcAddress(mod, #func); - GET_PROC(hmsi, MsiApplyMultiplePatchesA); GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hshell32, SHGetFolderPathA); @@ -639,6 +638,65 @@ static UINT create_custom_action_table( MSIHANDLE hdb ) "PRIMARY KEY `Action`)" ); } +static UINT create_dialog_table( MSIHANDLE hdb ) +{ + return run_query(hdb, + "CREATE TABLE `Dialog` (" + "`Dialog` CHAR(72) NOT NULL, " + "`HCentering` SHORT NOT NULL, " + "`VCentering` SHORT NOT NULL, " + "`Width` SHORT NOT NULL, " + "`Height` SHORT NOT NULL, " + "`Attributes` LONG, " + "`Title` CHAR(128) LOCALIZABLE, " + "`Control_First` CHAR(50) NOT NULL, " + "`Control_Default` CHAR(50), " + "`Control_Cancel` CHAR(50) " + "PRIMARY KEY `Dialog`)"); +} + +static UINT create_control_table( MSIHANDLE hdb ) +{ + return run_query(hdb, + "CREATE TABLE `Control` (" + "`Dialog_` CHAR(72) NOT NULL, " + "`Control` CHAR(50) NOT NULL, " + "`Type` CHAR(20) NOT NULL, " + "`X` SHORT NOT NULL, " + "`Y` SHORT NOT NULL, " + "`Width` SHORT NOT NULL, " + "`Height` SHORT NOT NULL, " + "`Attributes` LONG, " + "`Property` CHAR(50), " + "`Text` CHAR(0) LOCALIZABLE, " + "`Control_Next` CHAR(50), " + "`Help` CHAR(255) LOCALIZABLE " + "PRIMARY KEY `Dialog_`, `Control`)"); +} + +static UINT create_controlevent_table( MSIHANDLE hdb ) +{ + return run_query(hdb, + "CREATE TABLE `ControlEvent` (" + "`Dialog_` CHAR(72) NOT NULL, " + "`Control_` CHAR(50) NOT NULL, " + "`Event` CHAR(50) NOT NULL, " + "`Argument` CHAR(255) NOT NULL, " + "`Condition` CHAR(255), " + "`Ordering` SHORT " + "PRIMARY KEY `Dialog_`, `Control_`, `Event`, `Argument`, `Condition`)"); +} + +static UINT create_actiontext_table( MSIHANDLE hdb ) +{ + return run_query(hdb, + "CREATE TABLE `ActionText` (" + "`Action` CHAR(72) NOT NULL, " + "`Description` CHAR(64) LOCALIZABLE, " + "`Template` CHAR(128) LOCALIZABLE " + "PRIMARY KEY `Action`)"); +} + #define make_add_entry(type, qtext) \ static UINT add##_##type##_##entry( MSIHANDLE hdb, const char *values ) \ { \ @@ -722,6 +780,22 @@ make_add_entry(custom_action, "INSERT INTO `CustomAction` " "(`Action`, `Type`, `Source`, `Target`) VALUES( %s )") +make_add_entry(dialog, + "INSERT INTO `Dialog` " + "(`Dialog`, `HCentering`, `VCentering`, `Width`, `Height`, `Attributes`, `Control_First`) VALUES ( %s )") + +make_add_entry(control, + "INSERT INTO `Control` " + "(`Dialog_`, `Control`, `Type`, `X`, `Y`, `Width`, `Height`, `Attributes`, `Text`) VALUES( %s )"); + +make_add_entry(controlevent, + "INSERT INTO `ControlEvent` " + "(`Dialog_`, `Control_`, `Event`, `Argument`, `Condition`, `Ordering`) VALUES( %s )"); + +make_add_entry(actiontext, + "INSERT INTO `ActionText` " + "(`Action`, `Description`, `Template`) VALUES( %s )"); + static UINT add_reglocator_entry( MSIHANDLE hdb, const char *sig, UINT root, const char *path, const char *name, UINT type ) { @@ -839,18 +913,27 @@ static UINT package_from_db(MSIHANDLE hdb, MSIHANDLE *handle) return ERROR_SUCCESS; } -static void create_test_file(const CHAR *name) +static void create_file_data(LPCSTR name, LPCSTR data) { HANDLE file; DWORD written; file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); - WriteFile(file, name, strlen(name), &written, NULL); + if (file == INVALID_HANDLE_VALUE) + return; + + WriteFile(file, data, strlen(data), &written, NULL); WriteFile(file, "\n", strlen("\n"), &written, NULL); + CloseHandle(file); } +static void create_test_file(const CHAR *name) +{ + create_file_data(name, name); +} + typedef struct _tagVS_VERSIONINFO { WORD wLength; @@ -8747,48 +8830,43 @@ static void test_MsiApplyMultiplePatches(void) { UINT r, type = GetDriveTypeW(NULL); - if (!pMsiApplyMultiplePatchesA) { - win_skip("MsiApplyMultiplePatchesA not found\n"); - return; - } - - r = pMsiApplyMultiplePatchesA(NULL, NULL, NULL); + r = MsiApplyMultiplePatchesA(NULL, NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); - r = pMsiApplyMultiplePatchesA("", NULL, NULL); + r = MsiApplyMultiplePatchesA("", NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); - r = pMsiApplyMultiplePatchesA(";", NULL, NULL); + r = MsiApplyMultiplePatchesA(";", NULL, NULL); if (type == DRIVE_FIXED) todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); else ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); - r = pMsiApplyMultiplePatchesA(" ;", NULL, NULL); + r = MsiApplyMultiplePatchesA(" ;", NULL, NULL); if (type == DRIVE_FIXED) todo_wine ok(r == ERROR_PATCH_PACKAGE_OPEN_FAILED, "Expected ERROR_PATCH_PACKAGE_OPEN_FAILED, got %u\n", r); else ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); - r = pMsiApplyMultiplePatchesA(";;", NULL, NULL); + r = MsiApplyMultiplePatchesA(";;", NULL, NULL); if (type == DRIVE_FIXED) todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); else ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); - r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); + r = MsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); - r = pMsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); + r = MsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); if (type == DRIVE_FIXED) todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); else ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); - r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); + r = MsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); - r = pMsiApplyMultiplePatchesA(" nosuchpatchpackage ; nosuchpatchpackage ", NULL, NULL); + r = MsiApplyMultiplePatchesA(" nosuchpatchpackage ; nosuchpatchpackage ", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); } @@ -9074,6 +9152,696 @@ error: DeleteFileA( msifile ); } +static int externalui_ran; + +static INT CALLBACK externalui_callback(void *context, UINT message_type, LPCSTR message) +{ + externalui_ran = 1; + ok(message_type == INSTALLMESSAGE_USER, "expected INSTALLMESSAGE_USER, got %08x\n", message_type); + return 0; +} + +static int externalui_record_ran; + +static INT CALLBACK externalui_record_callback(void *context, UINT message_type, MSIHANDLE hrecord) +{ + INT retval = context ? *((INT *)context) : 0; + UINT r; + externalui_record_ran = 1; + ok(message_type == INSTALLMESSAGE_USER, "expected INSTALLMESSAGE_USER, got %08x\n", message_type); + r = MsiRecordGetFieldCount(hrecord); + ok(r == 1, "expected 1, got %u\n", r); + r = MsiRecordGetInteger(hrecord, 1); + ok(r == 12345, "expected 12345, got %u\n", r); + return retval; +} + +static void test_externalui(void) +{ + /* test that external UI handlers work correctly */ + + INSTALLUI_HANDLERA prev; + INSTALLUI_HANDLER_RECORD prev_record; + MSIHANDLE hpkg, hrecord; + UINT r; + INT retval = 0; + + prev = MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); + + r = package_from_db(create_package_db(), &hpkg); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + DeleteFileA(msifile); + return; + } + ok(r == ERROR_SUCCESS, "Expected a valid package %u\n", r); + + hrecord = MsiCreateRecord(1); + ok(hrecord, "Expected a valid record\n"); + r = MsiRecordSetStringA(hrecord, 0, "test message [1]"); + ok(r == ERROR_SUCCESS, "MsiSetString failed %u\n", r); + r = MsiRecordSetInteger(hrecord, 1, 12345); + ok(r == ERROR_SUCCESS, "MsiSetInteger failed %u\n", r); + + externalui_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + + prev = MsiSetExternalUIA(prev, 0, NULL); + ok(prev == externalui_callback, "wrong callback function %p\n", prev); + r = MsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_USER, &retval, &prev_record); + ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 0, "external UI callback should not have run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + retval = 1; + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 1, "expected 1, got %u\n", r); + ok(externalui_ran == 0, "external UI callback should not have run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + /* filter and context should be kept separately */ + r = MsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_ERROR, &retval, &prev_record); + ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + ok(externalui_record_ran == 0, "external UI record callback should not have run\n"); + + MsiCloseHandle(hpkg); + DeleteFileA(msifile); +} + +struct externalui_message { + UINT message; + int field_count; + char field[4][100]; + int match[4]; /* should we test for a match */ + int optional; +}; + +static struct externalui_message *sequence; +static int sequence_count, sequence_size; + +static void add_message(const struct externalui_message *msg) +{ + if (!sequence) + { + sequence_size = 10; + sequence = HeapAlloc(GetProcessHeap(), 0, sequence_size * sizeof(*sequence)); + } + if (sequence_count == sequence_size) + { + sequence_size *= 2; + sequence = HeapReAlloc(GetProcessHeap(), 0, sequence, sequence_size * sizeof(*sequence)); + } + + assert(sequence); + + sequence[sequence_count++] = *msg; +} + +static void flush_sequence(void) +{ + HeapFree(GetProcessHeap(), 0, sequence); + sequence = NULL; + sequence_count = sequence_size = 0; +} + +static void ok_sequence_(const struct externalui_message *expected, const char *context, BOOL todo, + const char *file, int line) +{ + static const struct externalui_message end_of_sequence = {0}; + const struct externalui_message *actual; + int failcount = 0; + int i; + + add_message(&end_of_sequence); + + actual = sequence; + + while (expected->message && actual->message) + { + if (expected->message == actual->message) + { + if (expected->field_count != actual->field_count) + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: in msg 0x%08x expecting field count %d got %d\n", + context, expected->message, expected->field_count, actual->field_count); + failcount++; + } + + for (i = 0; i <= actual->field_count; i++) + { + if (expected->match[i] && strcmp(expected->field[i], actual->field[i])) + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: in msg 0x%08x field %d: expected \"%s\", got \"%s\"\n", + context, expected->message, i, expected->field[i], actual->field[i]); + failcount++; + } + } + + expected++; + actual++; + } + else + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: the msg 0x%08x was expected, but got msg 0x%08x instead\n", + context, expected->message, actual->message); + failcount++; + if (todo) + goto done; + expected++; + actual++; + } + } + + if (expected->message || actual->message) + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %08x - actual %08x\n", + context, expected->message, actual->message); + failcount++; + } + + if(todo && !failcount) /* succeeded yet marked todo */ + { + todo_wine + ok_(file, line)(TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + } + +done: + flush_sequence(); +} + +#define ok_sequence(exp, contx, todo) \ + ok_sequence_((exp), (contx), (todo), __FILE__, __LINE__) + +static const struct externalui_message empty_sequence[] = { + {0} +}; + +static const struct externalui_message openpackage_nonexistent_sequence[] = { + {INSTALLMESSAGE_INITIALIZE, -1}, + {INSTALLMESSAGE_TERMINATE, -1}, + {0} +}; + +static const struct externalui_message openpackage_sequence[] = { + {INSTALLMESSAGE_INITIALIZE, -1}, + {INSTALLMESSAGE_COMMONDATA, 3, {"", "0", "1033", "1252"}, {1, 1, 1, 1}}, + {INSTALLMESSAGE_INFO|MB_ICONHAND, 0, {""}, {0}}, + {INSTALLMESSAGE_COMMONDATA, 3, {"", "0", "1033", "1252"}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_COMMONDATA, 3, {"", "1", "", ""}, {0, 1, 0, 0}}, + {0} +}; + +static const struct externalui_message processmessage_info_sequence[] = { + {INSTALLMESSAGE_INFO, 3, {"zero", "one", "two", "three"}, {1, 1, 1, 1}}, + {0} +}; + +static const struct externalui_message processmessage_actionstart_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "name", "description", "template"}, {0, 1, 1, 1}}, + {0} +}; + +static const struct externalui_message processmessage_actiondata_sequence[] = { + {INSTALLMESSAGE_ACTIONDATA, 3, {"{{name: }}template", "cherry", "banana", "guava"}, {1, 1, 1, 1}}, + {0} +}; + +static const struct externalui_message processmessage_error_sequence[] = { + {INSTALLMESSAGE_USER, 3, {"", "1311", "banana", "guava"}, {0, 1, 1, 1}}, + {0} +}; + +static const struct externalui_message processmessage_internal_error_sequence[] = { + {INSTALLMESSAGE_INFO, 3, {"DEBUG: Error [1]: Action not found: [2]", "2726", "banana", "guava"}, {1, 1, 1, 1}}, + {INSTALLMESSAGE_USER, 3, {"internal error", "2726", "banana", "guava"}, {1, 1, 1, 1}}, + {0} +}; + +static const struct externalui_message processmessage_error_format_sequence[] = { + {INSTALLMESSAGE_USER, 3, {"", "2726", "banana", "guava"}, {0, 1, 1, 1}}, + {0} +}; + +static const struct externalui_message doaction_costinitialize_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "CostInitialize", "cost description", "cost template"}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "CostInitialize", ""}, {0, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "CostInitialize", "1"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message doaction_custom_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "description", "template"}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "1"}, {0, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "0"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message doaction_custom_fullui_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", ""}, {0, 1, 1}}, + {INSTALLMESSAGE_SHOWDIALOG, 0, {"custom"}, {1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "1"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message doaction_custom_cancel_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "", ""}, {0, 1, 1, 1}}, + {0} +}; + +static const struct externalui_message doaction_dialog_nonexistent_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "1"}, {0, 1, 1}}, + {INSTALLMESSAGE_SHOWDIALOG, 0, {"custom"}, {1}}, + {INSTALLMESSAGE_INFO, 2, {"DEBUG: Error [1]: Action not found: [2]", "2726", "custom"}, {1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "2726", "custom"}, {0, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "0"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message doaction_dialog_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "dialog", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "dialog", "0"}, {0, 1, 1}}, + {INSTALLMESSAGE_SHOWDIALOG, 0, {"dialog"}, {1}}, + {INSTALLMESSAGE_ACTIONSTART, 2, {"", "dialog", "Dialog created"}, {0, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "dialog", "1"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message doaction_dialog_error_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "error", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "error", "1"}, {0, 1, 1}}, + {INSTALLMESSAGE_SHOWDIALOG, 0, {"error"}, {1}}, + {0} +}; + +static const struct externalui_message doaction_dialog_3_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "dialog", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "dialog", "0"}, {0, 1, 1}}, + {INSTALLMESSAGE_SHOWDIALOG, 0, {"dialog"}, {1}}, + {INSTALLMESSAGE_INFO, 2, {"", "dialog", "3"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message doaction_dialog_12345_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "dialog", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "dialog", "3"}, {0, 1, 1}}, + {INSTALLMESSAGE_SHOWDIALOG, 0, {"dialog"}, {1}}, + {INSTALLMESSAGE_INFO, 2, {"", "dialog", "12345"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message closehandle_sequence[] = { + {INSTALLMESSAGE_TERMINATE, -1}, + {0} +}; + +static INT CALLBACK externalui_message_string_callback(void *context, UINT message, LPCSTR string) +{ + INT retval = context ? *((INT *)context) : 0; + struct externalui_message msg; + + msg.message = message; + msg.field_count = 0; + strcpy(msg.field[0], string); + add_message(&msg); + + return retval; +} + +static INT CALLBACK externalui_message_callback(void *context, UINT message, MSIHANDLE hrecord) +{ + INT retval = context ? *((INT *)context) : 0; + struct externalui_message msg; + char buffer[100]; + DWORD length = 100; + int i; + + msg.message = message; + if (message == INSTALLMESSAGE_TERMINATE) + { + /* trying to access the record seems to hang on some versions of Windows */ + msg.field_count = -1; + add_message(&msg); + return 1; + } + msg.field_count = MsiRecordGetFieldCount(hrecord); + for (i = 0; i <= msg.field_count; i++) + { + length = 100; + MsiRecordGetStringA(hrecord, i, buffer, &length); + memcpy(msg.field[i], buffer, min(100, length+1)); + } + + add_message(&msg); + + return retval; +} + +static void test_externalui_message(void) +{ + /* test that events trigger the correct sequence of messages */ + + INSTALLUI_HANDLER_RECORD prev; + MSIHANDLE hdb, hpkg, hrecord; + INT retval = 1; + UINT r; + + MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); + + /* processing SHOWDIALOG with a record handler causes a crash on XP */ + MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, &retval); + r = MsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, &retval, &prev); + + flush_sequence(); + + CoInitialize(NULL); + + hdb = create_package_db(); + ok(hdb, "failed to create database\n"); + + create_file_data("forcecodepage.idt", "\r\n\r\n1252\t_ForceCodepage\r\n"); + r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = run_query(hdb, "CREATE TABLE `Error` (`Error` SHORT NOT NULL, `Message` CHAR(0) PRIMARY KEY `Error`)"); + ok(r == ERROR_SUCCESS, "Failed to create Error table: %u\n", r); + r = run_query(hdb, "INSERT INTO `Error` (`Error`, `Message`) VALUES (5, 'internal error')"); + ok(r == ERROR_SUCCESS, "Failed to insert into Error table: %u\n", r); + + r = create_actiontext_table(hdb); + ok(r == ERROR_SUCCESS, "Failed to create ActionText table: %u\n", r); + r = add_actiontext_entry(hdb, "'custom', 'description', 'template'"); + ok(r == ERROR_SUCCESS, "Failed to insert into ActionText table: %u\n", r); + r = add_actiontext_entry(hdb, "'CostInitialize', 'cost description', 'cost template'"); + ok(r == ERROR_SUCCESS, "Failed to insert into ActionText table: %u\n", r); + + r = MsiOpenPackageA(NULL, &hpkg); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok_sequence(empty_sequence, "MsiOpenPackage with NULL db", FALSE); + + r = MsiOpenPackageA("nonexistent", &hpkg); + ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); + ok_sequence(openpackage_nonexistent_sequence, "MsiOpenPackage with nonexistent db", FALSE); + + r = package_from_db(hdb, &hpkg); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + DeleteFileA(msifile); + return; + } + ok(r == ERROR_SUCCESS, "failed to create package %u\n", r); + ok_sequence(openpackage_sequence, "MsiOpenPackage with valid db", FALSE); + + /* Test MsiProcessMessage */ + hrecord = MsiCreateRecord(3); + ok(hrecord, "failed to create record\n"); + + MsiRecordSetStringA(hrecord, 0, "zero"); + MsiRecordSetStringA(hrecord, 1, "one"); + MsiRecordSetStringA(hrecord, 2, "two"); + MsiRecordSetStringA(hrecord, 3, "three"); + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_INFO, hrecord); + ok(r == 1, "Expected 1, got %d\n", r); + ok_sequence(processmessage_info_sequence, "MsiProcessMessage(INSTALLMESSAGE_INFO)", FALSE); + + MsiRecordSetStringA(hrecord, 1, "name"); + MsiRecordSetStringA(hrecord, 2, "description"); + MsiRecordSetStringA(hrecord, 3, "template"); + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_ACTIONSTART, hrecord); + ok(r == 1, "Expected 1, got %d\n", r); + ok_sequence(processmessage_actionstart_sequence, "MsiProcessMessage(INSTALLMESSAGE_ACTIONSTART)", FALSE); + + MsiRecordSetStringA(hrecord, 0, "apple"); + MsiRecordSetStringA(hrecord, 1, "cherry"); + MsiRecordSetStringA(hrecord, 2, "banana"); + MsiRecordSetStringA(hrecord, 3, "guava"); + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_ACTIONDATA, hrecord); + ok(r == 1, "Expected 1, got %d\n", r); + ok_sequence(processmessage_actiondata_sequence, "MsiProcessMessage(INSTALLMESSAGE_ACTIONDATA)", FALSE); + + /* non-internal error */ + MsiRecordSetStringA(hrecord, 0, NULL); + MsiRecordSetInteger(hrecord, 1, 1311); + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 1, "Expected 1, got %d\n", r); + ok_sequence(processmessage_error_sequence, "MsiProcessMessage non-internal error", FALSE); + + /* internal error */ + MsiRecordSetStringA(hrecord, 0, NULL); + MsiRecordSetInteger(hrecord, 1, 2726); + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "Expected 0, got %d\n", r); + ok_sequence(processmessage_internal_error_sequence, "MsiProcessMessage internal error", FALSE); + + /* with format field */ + MsiRecordSetStringA(hrecord, 0, "starfruit"); + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 1, "Expected 1, got %d\n", r); + ok_sequence(processmessage_error_format_sequence, "MsiProcessMessage error", FALSE); + + /* Test a standard action */ + r = MsiDoActionA(hpkg, "CostInitialize"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok_sequence(doaction_costinitialize_sequence, "MsiDoAction(\"CostInitialize\")", FALSE); + + /* Test a custom action */ + r = MsiDoActionA(hpkg, "custom"); + ok(r == ERROR_FUNCTION_NOT_CALLED, "Expected ERROR_FUNCTION_NOT_CALLED, got %d\n", r); + ok_sequence(doaction_custom_sequence, "MsiDoAction(\"custom\")", FALSE); + + /* close the package */ + MsiCloseHandle(hpkg); + ok_sequence(closehandle_sequence, "MsiCloseHandle()", FALSE); + + /* Test dialogs */ + hdb = create_package_db(); + ok(hdb, "failed to create database\n"); + + r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = create_dialog_table(hdb); + ok(r == ERROR_SUCCESS, "failed to create dialog table %u\n", r); + r = add_dialog_entry(hdb, "'dialog', 50, 50, 100, 100, 0, 'dummy'"); + ok(r == ERROR_SUCCESS, "failed to insert into dialog table %u\n", r); + + r = create_control_table(hdb); + ok(r == ERROR_SUCCESS, "failed to create control table %u\n", r); + r = add_control_entry(hdb, "'dialog', 'dummy', 'Text', 5, 5, 5, 5, 3, 'dummy'"); + ok(r == ERROR_SUCCESS, "failed to insert into control table %u\n", r); + + r = package_from_db(hdb, &hpkg); + ok(r == ERROR_SUCCESS, "failed to create package %u\n", r); + ok_sequence(openpackage_sequence, "MsiOpenPackage with valid db", FALSE); + + /* Test a custom action */ + r = MsiDoActionA(hpkg, "custom"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok_sequence(doaction_custom_fullui_sequence, "MsiDoAction(\"custom\")", FALSE); + + retval = 2; + r = MsiDoActionA(hpkg, "custom"); + ok(r == ERROR_INSTALL_USEREXIT, "Expected ERROR_INSTALL_USEREXIT, got %d\n", r); + ok_sequence(doaction_custom_cancel_sequence, "MsiDoAction(\"custom\")", FALSE); + + retval = 0; + r = MsiDoActionA(hpkg, "custom"); + ok(r == ERROR_FUNCTION_NOT_CALLED, "Expected ERROR_FUNCTION_NOT_CALLED, got %d\n", r); + ok_sequence(doaction_dialog_nonexistent_sequence, "MsiDoAction(\"custom\")", FALSE); + + r = MsiDoActionA(hpkg, "dialog"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok_sequence(doaction_dialog_sequence, "MsiDoAction(\"dialog\")", FALSE); + + retval = -1; + r = MsiDoActionA(hpkg, "error"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok_sequence(doaction_dialog_error_sequence, "MsiDoAction(\"error\")", FALSE); + + r = MsiDoActionA(hpkg, "error"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok_sequence(doaction_dialog_error_sequence, "MsiDoAction(\"error\")", FALSE); + + retval = -2; + r = MsiDoActionA(hpkg, "custom"); + ok(r == ERROR_FUNCTION_NOT_CALLED, "Expected ERROR_FUNCTION_NOT_CALLED, got %d\n", r); + ok_sequence(doaction_dialog_nonexistent_sequence, "MsiDoAction(\"custom\")", FALSE); + + retval = 3; + r = MsiDoActionA(hpkg, "dialog"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %d\n", r); + ok_sequence(doaction_dialog_3_sequence, "MsiDoAction(\"dialog\")", FALSE); + + retval = 12345; + r = MsiDoActionA(hpkg, "dialog"); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_INSTALL_FAILURE, got %d\n", r); + ok_sequence(doaction_dialog_12345_sequence, "MsiDoAction(\"dialog\")", FALSE); + + MsiCloseHandle(hpkg); + ok_sequence(closehandle_sequence, "MsiCloseHandle()", FALSE); + + MsiCloseHandle(hrecord); + CoUninitialize(); + DeleteFileA(msifile); + DeleteFileA("forcecodepage.idt"); +} + +static const struct externalui_message controlevent_spawn_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "spawn", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "spawn", ""}, {0, 1, 1}}, + {INSTALLMESSAGE_SHOWDIALOG, 0, {"spawn"}, {1}}, + {INSTALLMESSAGE_ACTIONSTART, 2, {"", "spawn", "Dialog created"}, {0, 1, 1}}, + + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", ""}, {0, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "1"}, {0, 1, 1}}, + + {INSTALLMESSAGE_ACTIONSTART, 2, {"", "child1", "Dialog created"}, {0, 1, 1}}, + + {INSTALLMESSAGE_INFO, 2, {"", "spawn", "2"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message controlevent_spawn2_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "spawn2", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "spawn2", "2"}, {0, 1, 1}}, + {INSTALLMESSAGE_SHOWDIALOG, 0, {"spawn2"}, {1}}, + {INSTALLMESSAGE_ACTIONSTART, 2, {"", "spawn2", "Dialog created"}, {0, 1, 1}}, + + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "2"}, {0, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "1"}, {0, 1, 1}}, + + {INSTALLMESSAGE_ACTIONSTART, 2, {"", "child2", "Dialog created"}, {0, 1, 1}}, + + {INSTALLMESSAGE_INFO, 2, {"", "spawn2", "2"}, {0, 1, 1}}, + {0} +}; + +static void test_controlevent(void) +{ + INSTALLUI_HANDLER_RECORD prev; + MSIHANDLE hdb, hpkg; + UINT r; + + if (!winetest_interactive) + { + skip("interactive ControlEvent tests\n"); + return; + } + + MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); + + /* processing SHOWDIALOG with a record handler causes a crash on XP */ + MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, NULL); + r = MsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, NULL, &prev); + + flush_sequence(); + + CoInitialize(NULL); + + hdb = create_package_db(); + ok(hdb, "failed to create database\n"); + + create_file_data("forcecodepage.idt", "\r\n\r\n1252\t_ForceCodepage\r\n"); + r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = create_dialog_table(hdb); + ok(r == ERROR_SUCCESS, "failed to create Dialog table: %u\n", r); + r = add_dialog_entry(hdb, "'spawn', 50, 50, 100, 100, 3, 'button'"); + ok(r == ERROR_SUCCESS, "failed to insert into Dialog table: %u\n", r); + r = add_dialog_entry(hdb, "'spawn2', 50, 50, 100, 100, 3, 'button'"); + ok(r == ERROR_SUCCESS, "failed to insert into Dialog table: %u\n", r); + r = add_dialog_entry(hdb, "'child1', 50, 50, 80, 40, 3, 'exit'"); + ok(r == ERROR_SUCCESS, "failed to insert into Dialog table: %u\n", r); + r = add_dialog_entry(hdb, "'child2', 50, 50, 80, 40, 3, 'exit'"); + ok(r == ERROR_SUCCESS, "failed to insert into Dialog table: %u\n", r); + + r = create_control_table(hdb); + ok(r == ERROR_SUCCESS, "failed to create Control table: %u\n", r); + r = add_control_entry(hdb, "'spawn', 'button', 'PushButton', 10, 10, 66, 17, 3, 'Click me'"); + ok(r == ERROR_SUCCESS, "failed to insert into Control table: %u\n", r); + r = add_control_entry(hdb, "'spawn2', 'button', 'PushButton', 10, 10, 66, 17, 3, 'Click me'"); + ok(r == ERROR_SUCCESS, "failed to insert into Control table: %u\n", r); + r = add_control_entry(hdb, "'child1', 'exit', 'PushButton', 10, 10, 66, 17, 3, 'Click me'"); + ok(r == ERROR_SUCCESS, "failed to insert into Control table: %u\n", r); + r = add_control_entry(hdb, "'child2', 'exit', 'PushButton', 10, 10, 66, 17, 3, 'Click me'"); + ok(r == ERROR_SUCCESS, "failed to insert into Control table: %u\n", r); + + r = create_controlevent_table(hdb); + ok(r == ERROR_SUCCESS, "failed to create ControlEvent table: %u\n", r); + r = add_controlevent_entry(hdb, "'child1', 'exit', 'EndDialog', 'Exit', 1, 1"); + ok(r == ERROR_SUCCESS, "failed to insert into ControlEvent table: %u\n", r); + r = add_controlevent_entry(hdb, "'child2', 'exit', 'EndDialog', 'Exit', 1, 1"); + ok(r == ERROR_SUCCESS, "failed to insert into ControlEvent table: %u\n", r); + + r = create_custom_action_table(hdb); + ok(r == ERROR_SUCCESS, "failed to create CustomAction table: %u\n", r); + r = add_custom_action_entry(hdb, "'custom', 51, 'dummy', 'dummy value'"); + ok(r == ERROR_SUCCESS, "failed to insert into CustomAction table: %u\n", r); + + /* SpawnDialog and EndDialog should trigger after all other events */ + r = add_controlevent_entry(hdb, "'spawn', 'button', 'SpawnDialog', 'child1', 1, 1"); + ok(r == ERROR_SUCCESS, "failed to insert into ControlEvent table: %u\n", r); + r = add_controlevent_entry(hdb, "'spawn', 'button', 'DoAction', 'custom', 1, 2"); + ok(r == ERROR_SUCCESS, "failed to insert into ControlEvent table: %u\n", r); + + /* Multiple dialog events cause only the last one to be triggered */ + r = add_controlevent_entry(hdb, "'spawn2', 'button', 'SpawnDialog', 'child1', 1, 1"); + ok(r == ERROR_SUCCESS, "failed to insert into ControlEvent table: %u\n", r); + r = add_controlevent_entry(hdb, "'spawn2', 'button', 'SpawnDialog', 'child2', 1, 2"); + ok(r == ERROR_SUCCESS, "failed to insert into ControlEvent table: %u\n", r); + r = add_controlevent_entry(hdb, "'spawn2', 'button', 'DoAction', 'custom', 1, 3"); + ok(r == ERROR_SUCCESS, "failed to insert into ControlEvent table: %u\n", r); + + r = package_from_db(hdb, &hpkg); + ok(r == ERROR_SUCCESS, "failed to create package: %u\n", r); + ok_sequence(openpackage_sequence, "MsiOpenPackage()", FALSE); + + r = MsiDoActionA(hpkg, "spawn"); + ok(r == ERROR_INSTALL_USEREXIT, "expected ERROR_INSTALL_USEREXIT, got %u\n", r); + ok_sequence(controlevent_spawn_sequence, "control event: spawn", FALSE); + + r = MsiDoActionA(hpkg, "spawn2"); + ok(r == ERROR_INSTALL_USEREXIT, "expected ERROR_INSTALL_USEREXIT, got %u\n", r); + ok_sequence(controlevent_spawn2_sequence, "control event: spawn2", FALSE); + + MsiCloseHandle(hpkg); + ok_sequence(closehandle_sequence, "MsiCloseHandle()", FALSE); + + CoUninitialize(); + DeleteFileA(msifile); + DeleteFileA("forcecodepage.idt"); +} + START_TEST(package) { STATEMGRSTATUS status; @@ -9131,6 +9899,9 @@ START_TEST(package) test_MsiApplyPatch(); test_MsiEnumComponentCosts(); test_MsiDatabaseCommit(); + test_externalui(); + test_externalui_message(); + test_controlevent(); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) { diff --git a/modules/rostests/winetests/msi/record.c b/modules/rostests/winetests/msi/record.c index 38d0f7627a..5caaefc72d 100644 --- a/modules/rostests/winetests/msi/record.c +++ b/modules/rostests/winetests/msi/record.c @@ -162,6 +162,21 @@ static void test_msirecord(void) ok(bufW[0] == 0, "MsiRecordGetStringW returned the wrong string\n"); ok(sz == 0, "MsiRecordGetStringW returned the wrong length\n"); + /* same record, but add a null integer to it */ + r = MsiRecordSetInteger(h, 0, 1); + ok(r == ERROR_SUCCESS, "Failed to set integer at 0\n"); + r = MsiRecordIsNull(h, 0); + ok(r == FALSE, "expected field to be non-null\n"); + r = MsiRecordSetInteger(h, 0, MSI_NULL_INTEGER); + ok(r == ERROR_SUCCESS, "Failed to set integer at 0\n"); + r = MsiRecordIsNull(h, 0); + ok(r == TRUE, "expected field to be null\n"); + sz = sizeof buf; + r = MsiRecordGetStringA(h, 0, buf, &sz); + ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); + ok(buf[0] == 0, "MsiRecordGetStringA returned the wrong string\n"); + ok(sz == 0, "MsiRecordGetStringA returned the wrong length\n"); + /* same record, but add a string to it */ r = MsiRecordSetStringA(h,0,str); ok(r == ERROR_SUCCESS, "Failed to set string at 0\n"); @@ -431,7 +446,7 @@ static void test_MsiRecordGetString(void) r = MsiRecordGetStringA(rec, 1, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "5"), "Expected \"5\", got \"%s\"\n", buf); - ok(sz == 1, "Expectd 1, got %d\n", sz); + ok(sz == 1, "Expected 1, got %d\n", sz); r = MsiRecordSetInteger(rec, 1, -5); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -441,7 +456,7 @@ static void test_MsiRecordGetString(void) r = MsiRecordGetStringA(rec, 1, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "-5"), "Expected \"-5\", got \"%s\"\n", buf); - ok(sz == 2, "Expectd 2, got %d\n", sz); + ok(sz == 2, "Expected 2, got %d\n", sz); MsiCloseHandle(rec); }

1 0

[reactos] 02/03: [MSI] Sync with Wine Staging 2.16. CORE-13762
by Amine Khaldi 08 Oct '17

08 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71bffdcde96c8b1769bfc… commit 71bffdcde96c8b1769bfc6b2e8c7888663ad265e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 8 09:14:40 2017 +0100 [MSI] Sync with Wine Staging 2.16. CORE-13762 cb4c1dc msi: Always return MSIDBSTATE_ERROR when MsiGetDatabaseState is called from a custom action. 04d242d msi: Create dummy thread to initialize COM for custom actions. 52fbaeb msi: Add support for ActionText table. 700ebc8 msi: Return the correct values from dialogs. a3dd99c msi: Return the current date and time. 4ccc82a msi: Use the Error table for more messages. 77e3d33 msi: Use MsiProcessMessage() to send error messages. 3ca2dfe msi: Avoid uninitialized pointer access on error path (Coverity). d631714 msi: Add a trailing linefeed to a FIXME() trace. 39c2ff0 msi: Send the dialog created message in dialog_create(). 14f865e msi: Don't queue a parent dialog to be shown in EndDialog. 8826584 msi: Process ShowDialog/EndDialog after all other control events. 44fb23d msi: Don't set _BrowseProperty. b4c39f4 msi: Avoid a null pointer dereference. 51bd884 msi: Properly parse empty format strings. 16f0dff msi: Return the correct values from custom actions. f348c7c msi: Rewrite dump_record(). f9c68df msi: Use the given record for INSTALLMESSAGE_ACTIONDATA. c788ed85 msi: Provide the result of the last action. 1505912 msi: Allow setting NULL in MsiSetInteger(). f9f53fe msi: Correctly format the template field for MsiProcessMessage(). 3033dae msi: Implement UI messages for dialogs. 5da9250 msi: Don't increment the refcount when creating dialogs. 48237e2 msi: Add a basic internal UI implementation. 39b841d msi: Fix a buffer overrun. 9032279 msi: Implement UI messages in MsiOpenPackage(). bcc4a04 msi: Implement INSTALLMESSAGE_INITIALIZE and INSTALLMESSAGE_TERMINATE. a388906 msi: Send the correct UI messages upon calling MsiDoAction(). de5246a msi: Don't reimplement record formatting. 4e49ae3cc msi: Pass the given record to the callback. df31a7c msi: Store string and record callback data separately. cef6799 msi: Use an external UI record handler before a string handler. --- dll/win32/msi/action.c | 529 +++++++++++++++++++++---------------------- dll/win32/msi/appsearch.c | 2 +- dll/win32/msi/assembly.c | 4 +- dll/win32/msi/classes.c | 16 +- dll/win32/msi/custom.c | 2 +- dll/win32/msi/database.c | 17 +- dll/win32/msi/dialog.c | 247 +++++++++----------- dll/win32/msi/files.c | 12 +- dll/win32/msi/font.c | 4 +- dll/win32/msi/format.c | 89 ++++---- dll/win32/msi/lang/msi_Bg.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_Da.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_De.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_En.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_Es.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_Fi.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_Fr.rc | 165 ++++++++++++-- dll/win32/msi/lang/msi_He.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_Hu.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_It.rc | 165 ++++++++++++-- dll/win32/msi/lang/msi_Ja.rc | 160 ++++++++++++- dll/win32/msi/lang/msi_Ko.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_Lt.rc | 165 ++++++++++++-- dll/win32/msi/lang/msi_Nl.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_No.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_Pl.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_Pt.rc | 326 ++++++++++++++++++++++++-- dll/win32/msi/lang/msi_Ro.rc | 192 +++++++++++++--- dll/win32/msi/lang/msi_Ru.rc | 165 ++++++++++++-- dll/win32/msi/lang/msi_Si.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_Sq.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_Sr.rc | 326 ++++++++++++++++++++++++-- dll/win32/msi/lang/msi_Sv.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_Tr.rc | 164 +++++++++++++- dll/win32/msi/lang/msi_Uk.rc | 165 ++++++++++++-- dll/win32/msi/lang/msi_Zh.rc | 327 ++++++++++++++++++++++++-- dll/win32/msi/media.c | 40 +--- dll/win32/msi/msi.c | 15 +- dll/win32/msi/msi.rc | 43 +--- dll/win32/msi/msi_main.c | 4 +- dll/win32/msi/msipriv.h | 16 +- dll/win32/msi/package.c | 499 +++++++++++++++++++++++++++++----------- dll/win32/msi/record.c | 38 +++- dll/win32/msi/resource.h | 161 +++++++++++++ dll/win32/msi/rsrc.rc | 81 +++++++ dll/win32/msi/table.c | 19 -- dll/win32/msi/upgrade.c | 2 +- media/doc/README.WINE | 2 +- 48 files changed, 5540 insertions(+), 1082 deletions(-) diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c index cd1be04572..8c17f3b512 100644 --- a/dll/win32/msi/action.c +++ b/dll/win32/msi/action.c @@ -140,49 +140,56 @@ static const WCHAR szValidateProductID[] = static const WCHAR szWriteEnvironmentStrings[] = {'W','r','i','t','e','E','n','v','i','r','o','n','m','e','n','t','S','t','r','i','n','g','s',0}; -static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action) +struct dummy_thread { - static const WCHAR Query_t[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','A','c','t','i','o', 'n','T','e','x','t','`',' ', - 'W','H','E','R','E', ' ','`','A','c','t','i','o','n','`',' ','=', - ' ','\'','%','s','\'',0}; - MSIRECORD * row; + HANDLE started; + HANDLE stopped; + HANDLE thread; +}; - row = MSI_QueryGetRecord( package->db, Query_t, action ); - if (!row) - return; - MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, row); +static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template) +{ + WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','A','c','t','i','o','n','T','e','x','t','`',' ','W','H','E','R','E',' ', + '`','A','c','t','i','o','n','`',' ','=',' ','\'','%','s','\'',0}; + MSIRECORD *row, *textrow; + INT rc; + + textrow = MSI_QueryGetRecord(package->db, query, action); + if (textrow) + { + description = MSI_RecordGetString(textrow, 2); + template = MSI_RecordGetString(textrow, 3); + } + + row = MSI_CreateRecord(3); + if (!row) return -1; + MSI_RecordSetStringW(row, 1, action); + MSI_RecordSetStringW(row, 2, description); + MSI_RecordSetStringW(row, 3, template); + rc = MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, row); + if (textrow) msiobj_release(&textrow->hdr); msiobj_release(&row->hdr); + return rc; } static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start, - UINT rc) -{ - MSIRECORD * row; - static const WCHAR template_s[]= - {'A','c','t','i','o','n',' ','s','t','a','r','t',' ','%','s',':',' ', - '%','s', '.',0}; - static const WCHAR template_e[]= - {'A','c','t','i','o','n',' ','e','n','d','e','d',' ','%','s',':',' ', - '%','s', '.',' ','R','e','t','u','r','n',' ','v','a','l','u','e',' ', - '%','i','.',0}; - static const WCHAR format[] = - {'H','H','\'',':','\'','m','m','\'',':','\'','s','s',0}; - WCHAR message[1024]; - WCHAR timet[0x100]; - - GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, format, timet, 0x100); - if (start) - sprintfW(message,template_s,timet,action); - else - sprintfW(message,template_e,timet,action,rc); - - row = MSI_CreateRecord(1); - MSI_RecordSetStringW(row,1,message); - + INT rc) +{ + MSIRECORD *row; + WCHAR *template; + + template = msi_get_error_message(package->db, start ? MSIERR_INFO_ACTIONSTART : MSIERR_INFO_ACTIONENDED); + + row = MSI_CreateRecord(2); + if (!row) return; + MSI_RecordSetStringW(row, 0, template); + MSI_RecordSetStringW(row, 1, action); + MSI_RecordSetInteger(row, 2, start ? package->LastActionResult : rc); MSI_ProcessMessage(package, INSTALLMESSAGE_INFO, row); msiobj_release(&row->hdr); + msi_free(template); + if (!start) package->LastActionResult = rc; } enum parse_state @@ -493,9 +500,6 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) msi_dialog_check_messages( NULL ); - if (package->CurrentInstallState != ERROR_SUCCESS) - rc = package->CurrentInstallState; - if (rc == ERROR_FUNCTION_NOT_CALLED) rc = ERROR_SUCCESS; @@ -601,18 +605,42 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package) /******************************************************** * ACTION helper functions and functions that perform the actions *******************************************************/ -static BOOL ACTION_HandleCustomAction( MSIPACKAGE *package, LPCWSTR action, UINT *rc, UINT script ) +static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script) { - BOOL ret=FALSE; UINT arc; + INT uirc; + uirc = ui_actionstart(package, action, NULL, NULL); + if (uirc == IDCANCEL) + return ERROR_INSTALL_USEREXIT; + ui_actioninfo(package, action, TRUE, 0); arc = ACTION_CustomAction( package, action, script ); - if (arc != ERROR_CALL_NOT_IMPLEMENTED) + uirc = !arc; + + if (arc == ERROR_FUNCTION_NOT_CALLED && needs_ui_sequence(package)) { - *rc = arc; - ret = TRUE; + uirc = ACTION_ShowDialog(package, action); + switch (uirc) + { + case -1: + return ERROR_SUCCESS; /* stop immediately */ + case 0: arc = ERROR_FUNCTION_NOT_CALLED; break; + case 1: arc = ERROR_SUCCESS; break; + case 2: arc = ERROR_INSTALL_USEREXIT; break; + case 3: arc = ERROR_INSTALL_FAILURE; break; + case 4: arc = ERROR_INSTALL_SUSPEND; break; + case 5: arc = ERROR_MORE_DATA; break; + case 6: arc = ERROR_INVALID_HANDLE_STATE; break; + case 7: arc = ERROR_INVALID_DATA; break; + case 8: arc = ERROR_INSTALL_ALREADY_RUNNING; break; + case 9: arc = ERROR_INSTALL_PACKAGE_REJECTED; break; + default: arc = ERROR_FUNCTION_FAILED; break; + } } - return ret; + + ui_actioninfo(package, action, FALSE, uirc); + + return arc; } MSICOMPONENT *msi_get_loaded_component( MSIPACKAGE *package, const WCHAR *Component ) @@ -718,41 +746,6 @@ void msi_ui_progress( MSIPACKAGE *package, int a, int b, int c, int d ) msi_dialog_check_messages( NULL ); } -void msi_ui_actiondata( MSIPACKAGE *package, const WCHAR *action, MSIRECORD *record ) -{ - static const WCHAR query[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','A','c','t','i','o', 'n','T','e','x','t','`',' ', - 'W','H','E','R','E',' ', '`','A','c','t','i','o','n','`',' ','=',' ','\'','%','s','\'',0}; - WCHAR message[1024]; - MSIRECORD *row = 0; - DWORD size; - - if (!package->LastAction || strcmpW( package->LastAction, action )) - { - if (!(row = MSI_QueryGetRecord( package->db, query, action ))) return; - - if (MSI_RecordIsNull( row, 3 )) - { - msiobj_release( &row->hdr ); - return; - } - /* update the cached action format */ - msi_free( package->ActionFormat ); - package->ActionFormat = msi_dup_record_field( row, 3 ); - msi_free( package->LastAction ); - package->LastAction = strdupW( action ); - msiobj_release( &row->hdr ); - } - size = 1024; - MSI_RecordSetStringW( record, 0, package->ActionFormat ); - MSI_FormatRecordW( package, record, message, &size ); - row = MSI_CreateRecord( 1 ); - MSI_RecordSetStringW( row, 1, message ); - MSI_ProcessMessage( package, INSTALLMESSAGE_ACTIONDATA, row ); - msiobj_release( &row->hdr ); -} - INSTALLSTATE msi_get_component_action( MSIPACKAGE *package, MSICOMPONENT *comp ) { if (!comp->Enabled) @@ -807,7 +800,7 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) uirow = MSI_CreateRecord(1); MSI_RecordSetStringW(uirow, 1, dir); - msi_ui_actiondata(package, szCreateFolders, uirow); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release(&uirow->hdr); full_path = msi_get_target_folder( package, dir ); @@ -895,7 +888,7 @@ static UINT ITERATE_RemoveFolders( MSIRECORD *row, LPVOID param ) uirow = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( uirow, 1, dir ); - msi_ui_actiondata( package, szRemoveFolders, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); folder = msi_get_loaded_folder( package, dir ); @@ -1551,7 +1544,7 @@ static UINT ACTION_CostInitialize(MSIPACKAGE *package) static UINT execute_script_action( MSIPACKAGE *package, UINT script, UINT index ) { const WCHAR *action = package->script->Actions[script][index]; - ui_actionstart( package, action ); + ui_actionstart( package, action, NULL, NULL ); TRACE("executing %s\n", debugstr_w(action)); return ACTION_PerformAction( package, action, script ); } @@ -2956,7 +2949,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) MSI_RecordSetStringW(uirow,1,uikey); if (type == REG_SZ || type == REG_EXPAND_SZ) MSI_RecordSetStringW(uirow, 3, (LPWSTR)new_value); - msi_ui_actiondata( package, szWriteRegistryValues, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free(new_value); @@ -3110,7 +3103,7 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, ui_key_str ); MSI_RecordSetStringW( uirow, 2, deformated_name ); - msi_ui_actiondata( package, szRemoveRegistryValues, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free( ui_key_str ); @@ -3173,7 +3166,7 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, ui_key_str ); MSI_RecordSetStringW( uirow, 2, deformated_name ); - msi_ui_actiondata( package, szRemoveRegistryValues, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free( ui_key_str ); @@ -3632,7 +3625,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) MSI_RecordSetStringW(uirow,1,package->ProductCode); MSI_RecordSetStringW(uirow,2,comp->ComponentId); MSI_RecordSetStringW(uirow,3,comp->FullKeypath); - msi_ui_actiondata( package, szProcessComponents, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); } return ERROR_SUCCESS; @@ -3726,7 +3719,7 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) TRACE("component has no key path\n"); return ERROR_SUCCESS; } - msi_ui_actiondata( package, szRegisterTypeLibraries, row ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, row); module = LoadLibraryExW( file->TargetPath, NULL, LOAD_LIBRARY_AS_DATAFILE ); if (module) @@ -3817,7 +3810,7 @@ static UINT ITERATE_UnregisterTypeLibraries( MSIRECORD *row, LPVOID param ) TRACE("component not scheduled for removal %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - msi_ui_actiondata( package, szUnregisterTypeLibraries, row ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, row); guid = MSI_RecordGetString( row, 1 ); CLSIDFromString( guid, &libid ); @@ -3931,7 +3924,7 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) TRACE("component not scheduled for installation %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - msi_ui_actiondata( package, szCreateShortcuts, row ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, row); res = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID *) &sl ); @@ -4062,7 +4055,7 @@ static UINT ITERATE_RemoveShortcuts( MSIRECORD *row, LPVOID param ) TRACE("component not scheduled for removal %s\n", debugstr_w(component)); return ERROR_SUCCESS; } - msi_ui_actiondata( package, szRemoveShortcuts, row ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, row); link_file = get_link_file( package, row ); @@ -4493,7 +4486,7 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) end: uirow = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( uirow, 1, package->ProductCode ); - msi_ui_actiondata( package, szPublishProduct, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); RegCloseKey(hukey); @@ -4599,7 +4592,7 @@ static UINT ITERATE_WriteIniValues(MSIRECORD *row, LPVOID param) MSI_RecordSetStringW(uirow,2,deformated_section); MSI_RecordSetStringW(uirow,3,deformated_key); MSI_RecordSetStringW(uirow,4,deformated_value); - msi_ui_actiondata( package, szWriteIniValues, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free(fullname); @@ -4679,7 +4672,7 @@ static UINT ITERATE_RemoveIniValuesOnUninstall( MSIRECORD *row, LPVOID param ) MSI_RecordSetStringW( uirow, 2, deformated_section ); MSI_RecordSetStringW( uirow, 3, deformated_key ); MSI_RecordSetStringW( uirow, 4, deformated_value ); - msi_ui_actiondata( package, szRemoveIniValues, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free( deformated_key ); @@ -4740,7 +4733,7 @@ static UINT ITERATE_RemoveIniValuesOnInstall( MSIRECORD *row, LPVOID param ) MSI_RecordSetStringW( uirow, 2, deformated_section ); MSI_RecordSetStringW( uirow, 3, deformated_key ); MSI_RecordSetStringW( uirow, 4, deformated_value ); - msi_ui_actiondata( package, szRemoveIniValues, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free( deformated_key ); @@ -4781,17 +4774,10 @@ static UINT ACTION_RemoveIniValues( MSIPACKAGE *package ) static void register_dll( const WCHAR *dll, BOOL unregister ) { -#ifdef __REACTOS__ - static const WCHAR regW[] = - {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','s',' ','\"','%','s','\"',0}; - static const WCHAR unregW[] = - {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','s',' ','/','u',' ','\"','%','s','\"',0}; -#else /* __REACTOS__ */ static const WCHAR regW[] = {'r','e','g','s','v','r','3','2','.','e','x','e',' ','\"','%','s','\"',0}; static const WCHAR unregW[] = {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','u',' ','\"','%','s','\"',0}; -#endif /* __REACTOS__ */ PROCESS_INFORMATION pi; STARTUPINFOW si; WCHAR *cmd; @@ -4838,7 +4824,7 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, file->File ); MSI_RecordSetStringW( uirow, 2, file->Component->Directory ); - msi_ui_actiondata( package, szSelfRegModules, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); return ERROR_SUCCESS; @@ -4888,7 +4874,7 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param ) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, file->File ); MSI_RecordSetStringW( uirow, 2, file->Component->Directory ); - msi_ui_actiondata( package, szSelfUnregModules, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); return ERROR_SUCCESS; @@ -5008,7 +4994,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) /* the UI chunk */ uirow = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( uirow, 1, feature->Feature ); - msi_ui_actiondata( package, szPublishFeatures, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); /* FIXME: call msi_ui_progress? */ } @@ -5045,7 +5031,7 @@ static UINT msi_unpublish_feature(MSIPACKAGE *package, MSIFEATURE *feature) uirow = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( uirow, 1, feature->Feature ); - msi_ui_actiondata( package, szUnpublishFeatures, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); return ERROR_SUCCESS; @@ -5245,7 +5231,7 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) done: uirow = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( uirow, 1, package->ProductCode ); - msi_ui_actiondata( package, szRegisterProduct, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); RegCloseKey(hkey); @@ -5456,43 +5442,6 @@ UINT ACTION_ForceReboot(MSIPACKAGE *package) return ERROR_INSTALL_SUSPEND; } -WCHAR *msi_build_error_string( MSIPACKAGE *package, UINT error, DWORD count, ... ) -{ - static const WCHAR query[] = - {'S','E','L','E','C','T',' ','`','M','e','s','s','a','g','e','`',' ', - 'F','R','O','M',' ','`','E','r','r','o','r','`',' ','W','H','E','R','E',' ', - '`','E','r','r','o','r','`',' ','=',' ','%','i',0}; - MSIRECORD *rec, *row; - DWORD i, size = 0; - va_list va; - const WCHAR *str; - WCHAR *data; - - if (!(row = MSI_QueryGetRecord( package->db, query, error ))) return 0; - - rec = MSI_CreateRecord( count + 2 ); - str = MSI_RecordGetString( row, 1 ); - MSI_RecordSetStringW( rec, 0, str ); - msiobj_release( &row->hdr ); - MSI_RecordSetInteger( rec, 1, error ); - - va_start( va, count ); - for (i = 0; i < count; i++) - { - str = va_arg( va, const WCHAR *); - MSI_RecordSetStringW( rec, i + 2, str ); - } - va_end( va ); - - MSI_FormatRecordW( package, rec, NULL, &size ); - size++; - data = msi_alloc( size * sizeof(WCHAR) ); - if (size > 1) MSI_FormatRecordW( package, rec, data, &size ); - else data[0] = 0; - msiobj_release( &rec->hdr ); - return data; -} - static UINT ACTION_ResolveSource(MSIPACKAGE* package) { DWORD attrib; @@ -5510,7 +5459,8 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) attrib = GetFileAttributesW(package->db->path); if (attrib == INVALID_FILE_ATTRIBUTES) { - LPWSTR prompt, msg; + MSIRECORD *record; + LPWSTR prompt; DWORD size = 0; rc = MsiSourceListGetInfoW(package->ProductCode, NULL, @@ -5526,19 +5476,18 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) else prompt = strdupW(package->db->path); - msg = msi_build_error_string(package, 1302, 1, prompt); + record = MSI_CreateRecord(2); + MSI_RecordSetInteger(record, 1, MSIERR_INSERTDISK); + MSI_RecordSetStringW(record, 2, prompt); msi_free(prompt); while(attrib == INVALID_FILE_ATTRIBUTES) { - rc = MessageBoxW(NULL, msg, NULL, MB_OKCANCEL); + MSI_RecordSetStringW(record, 0, NULL); + rc = MSI_ProcessMessage(package, INSTALLMESSAGE_ERROR, record); if (rc == IDCANCEL) - { - msi_free(msg); return ERROR_INSTALL_USEREXIT; - } attrib = GetFileAttributesW(package->db->path); } - msi_free(msg); rc = ERROR_SUCCESS; } else @@ -5595,7 +5544,7 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package) end: uirow = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( uirow, 1, productid ); - msi_ui_actiondata( package, szRegisterUser, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free(productid); @@ -5735,7 +5684,7 @@ end: uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, compgroupid ); MSI_RecordSetStringW( uirow, 2, qualifier); - msi_ui_actiondata( package, szPublishComponents, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); /* FIXME: call ui_progress? */ @@ -5812,7 +5761,7 @@ static UINT ITERATE_UnpublishComponent( MSIRECORD *rec, LPVOID param ) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, compgroupid ); MSI_RecordSetStringW( uirow, 2, qualifier ); - msi_ui_actiondata( package, szUnpublishComponents, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); return ERROR_SUCCESS; @@ -6124,7 +6073,7 @@ done: uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, display_name ); MSI_RecordSetStringW( uirow, 2, name ); - msi_ui_actiondata( package, szStartServices, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); if (service) CloseServiceHandle(service); @@ -6292,7 +6241,7 @@ done: uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, display_name ); MSI_RecordSetStringW( uirow, 2, name ); - msi_ui_actiondata( package, szStopServices, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free( name ); @@ -6372,7 +6321,7 @@ done: uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, display_name ); MSI_RecordSetStringW( uirow, 2, name ); - msi_ui_actiondata( package, szDeleteServices, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); if (service) CloseServiceHandle( service ); @@ -6490,7 +6439,7 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) MSI_RecordSetStringW( uirow, 1, desc ); MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); MSI_RecordSetStringW( uirow, 3, driver_file->Component->Directory ); - msi_ui_actiondata( package, szInstallODBC, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free(driver); @@ -6578,7 +6527,7 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) MSI_RecordSetStringW( uirow, 1, desc ); MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); MSI_RecordSetStringW( uirow, 3, translator_file->Component->Directory ); - msi_ui_actiondata( package, szInstallODBC, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free(translator); @@ -6639,7 +6588,7 @@ static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) MSI_RecordSetStringW( uirow, 1, desc ); MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); MSI_RecordSetInteger( uirow, 3, request ); - msi_ui_actiondata( package, szInstallODBC, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free(attrs); @@ -6721,7 +6670,7 @@ static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, desc ); MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); - msi_ui_actiondata( package, szRemoveODBC, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); return ERROR_SUCCESS; @@ -6760,7 +6709,7 @@ static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, desc ); MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); - msi_ui_actiondata( package, szRemoveODBC, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); return ERROR_SUCCESS; @@ -6819,7 +6768,7 @@ static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) MSI_RecordSetStringW( uirow, 1, desc ); MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); MSI_RecordSetInteger( uirow, 3, request ); - msi_ui_actiondata( package, szRemoveODBC, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); return ERROR_SUCCESS; @@ -7167,7 +7116,7 @@ done: MSI_RecordSetStringW( uirow, 1, name ); MSI_RecordSetStringW( uirow, 2, newval ); MSI_RecordSetInteger( uirow, 3, action ); - msi_ui_actiondata( package, szWriteEnvironmentStrings, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); if (env) RegCloseKey(env); @@ -7310,7 +7259,7 @@ done: MSI_RecordSetStringW( uirow, 1, name ); MSI_RecordSetStringW( uirow, 2, value ); MSI_RecordSetInteger( uirow, 3, action ); - msi_ui_actiondata( package, szRemoveEnvironmentStrings, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); if (env) RegCloseKey( env ); @@ -7382,7 +7331,7 @@ static UINT ACTION_AllocateRegistrySpace( MSIPACKAGE *package ) uirow = MSI_CreateRecord( 1 ); MSI_RecordSetInteger( uirow, 1, space ); - msi_ui_actiondata( package, szAllocateRegistrySpace, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); return ERROR_SUCCESS; @@ -7681,93 +7630,95 @@ static UINT ACTION_InstallSFPCatalogFile( MSIPACKAGE *package ) static const struct { const WCHAR *action; + const UINT description; + const UINT template; UINT (*handler)(MSIPACKAGE *); const WCHAR *action_rollback; } StandardActions[] = { - { szAllocateRegistrySpace, ACTION_AllocateRegistrySpace, NULL }, - { szAppSearch, ACTION_AppSearch, NULL }, - { szBindImage, ACTION_BindImage, NULL }, - { szCCPSearch, ACTION_CCPSearch, NULL }, - { szCostFinalize, ACTION_CostFinalize, NULL }, - { szCostInitialize, ACTION_CostInitialize, NULL }, - { szCreateFolders, ACTION_CreateFolders, szRemoveFolders }, - { szCreateShortcuts, ACTION_CreateShortcuts, szRemoveShortcuts }, - { szDeleteServices, ACTION_DeleteServices, szInstallServices }, - { szDisableRollback, ACTION_DisableRollback, NULL }, - { szDuplicateFiles, ACTION_DuplicateFiles, szRemoveDuplicateFiles }, - { szExecuteAction, ACTION_ExecuteAction, NULL }, - { szFileCost, ACTION_FileCost, NULL }, - { szFindRelatedProducts, ACTION_FindRelatedProducts, NULL }, - { szForceReboot, ACTION_ForceReboot, NULL }, - { szInstallAdminPackage, ACTION_InstallAdminPackage, NULL }, - { szInstallExecute, ACTION_InstallExecute, NULL }, - { szInstallExecuteAgain, ACTION_InstallExecute, NULL }, - { szInstallFiles, ACTION_InstallFiles, szRemoveFiles }, - { szInstallFinalize, ACTION_InstallFinalize, NULL }, - { szInstallInitialize, ACTION_InstallInitialize, NULL }, - { szInstallODBC, ACTION_InstallODBC, szRemoveODBC }, - { szInstallServices, ACTION_InstallServices, szDeleteServices }, - { szInstallSFPCatalogFile, ACTION_InstallSFPCatalogFile, NULL }, - { szInstallValidate, ACTION_InstallValidate, NULL }, - { szIsolateComponents, ACTION_IsolateComponents, NULL }, - { szLaunchConditions, ACTION_LaunchConditions, NULL }, - { szMigrateFeatureStates, ACTION_MigrateFeatureStates, NULL }, - { szMoveFiles, ACTION_MoveFiles, NULL }, - { szMsiPublishAssemblies, ACTION_MsiPublishAssemblies, szMsiUnpublishAssemblies }, - { szMsiUnpublishAssemblies, ACTION_MsiUnpublishAssemblies, szMsiPublishAssemblies }, - { szPatchFiles, ACTION_PatchFiles, NULL }, - { szProcessComponents, ACTION_ProcessComponents, szProcessComponents }, - { szPublishComponents, ACTION_PublishComponents, szUnpublishComponents }, - { szPublishFeatures, ACTION_PublishFeatures, szUnpublishFeatures }, - { szPublishProduct, ACTION_PublishProduct, szUnpublishProduct }, - { szRegisterClassInfo, ACTION_RegisterClassInfo, szUnregisterClassInfo }, - { szRegisterComPlus, ACTION_RegisterComPlus, szUnregisterComPlus }, - { szRegisterExtensionInfo, ACTION_RegisterExtensionInfo, szUnregisterExtensionInfo }, - { szRegisterFonts, ACTION_RegisterFonts, szUnregisterFonts }, - { szRegisterMIMEInfo, ACTION_RegisterMIMEInfo, szUnregisterMIMEInfo }, - { szRegisterProduct, ACTION_RegisterProduct, NULL }, - { szRegisterProgIdInfo, ACTION_RegisterProgIdInfo, szUnregisterProgIdInfo }, - { szRegisterTypeLibraries, ACTION_RegisterTypeLibraries, szUnregisterTypeLibraries }, - { szRegisterUser, ACTION_RegisterUser, NULL }, - { szRemoveDuplicateFiles, ACTION_RemoveDuplicateFiles, szDuplicateFiles }, - { szRemoveEnvironmentStrings, ACTION_RemoveEnvironmentStrings, szWriteEnvironmentStrings }, - { szRemoveExistingProducts, ACTION_RemoveExistingProducts, NULL }, - { szRemoveFiles, ACTION_RemoveFiles, szInstallFiles }, - { szRemoveFolders, ACTION_RemoveFolders, szCreateFolders }, - { szRemoveIniValues, ACTION_RemoveIniValues, szWriteIniValues }, - { szRemoveODBC, ACTION_RemoveODBC, szInstallODBC }, - { szRemoveRegistryValues, ACTION_RemoveRegistryValues, szWriteRegistryValues }, - { szRemoveShortcuts, ACTION_RemoveShortcuts, szCreateShortcuts }, - { szResolveSource, ACTION_ResolveSource, NULL }, - { szRMCCPSearch, ACTION_RMCCPSearch, NULL }, - { szScheduleReboot, ACTION_ScheduleReboot, NULL }, - { szSelfRegModules, ACTION_SelfRegModules, szSelfUnregModules }, - { szSelfUnregModules, ACTION_SelfUnregModules, szSelfRegModules }, - { szSetODBCFolders, ACTION_SetODBCFolders, NULL }, - { szStartServices, ACTION_StartServices, szStopServices }, - { szStopServices, ACTION_StopServices, szStartServices }, - { szUnpublishComponents, ACTION_UnpublishComponents, szPublishComponents }, - { szUnpublishFeatures, ACTION_UnpublishFeatures, szPublishFeatures }, - { szUnpublishProduct, ACTION_UnpublishProduct, NULL }, /* for rollback only */ - { szUnregisterClassInfo, ACTION_UnregisterClassInfo, szRegisterClassInfo }, - { szUnregisterComPlus, ACTION_UnregisterComPlus, szRegisterComPlus }, - { szUnregisterExtensionInfo, ACTION_UnregisterExtensionInfo, szRegisterExtensionInfo }, - { szUnregisterFonts, ACTION_UnregisterFonts, szRegisterFonts }, - { szUnregisterMIMEInfo, ACTION_UnregisterMIMEInfo, szRegisterMIMEInfo }, - { szUnregisterProgIdInfo, ACTION_UnregisterProgIdInfo, szRegisterProgIdInfo }, - { szUnregisterTypeLibraries, ACTION_UnregisterTypeLibraries, szRegisterTypeLibraries }, - { szValidateProductID, ACTION_ValidateProductID, NULL }, - { szWriteEnvironmentStrings, ACTION_WriteEnvironmentStrings, szRemoveEnvironmentStrings }, - { szWriteIniValues, ACTION_WriteIniValues, szRemoveIniValues }, - { szWriteRegistryValues, ACTION_WriteRegistryValues, szRemoveRegistryValues }, - { NULL, NULL, NULL } + { szAllocateRegistrySpace, IDS_DESC_ALLOCATEREGISTRYSPACE, IDS_TEMP_ALLOCATEREGISTRYSPACE, ACTION_AllocateRegistrySpace, NULL }, + { szAppSearch, IDS_DESC_APPSEARCH, IDS_TEMP_APPSEARCH, ACTION_AppSearch, NULL }, + { szBindImage, IDS_DESC_BINDIMAGE, IDS_TEMP_BINDIMAGE, ACTION_BindImage, NULL }, + { szCCPSearch, IDS_DESC_CCPSEARCH, 0, ACTION_CCPSearch, NULL }, + { szCostFinalize, IDS_DESC_COSTFINALIZE, 0, ACTION_CostFinalize, NULL }, + { szCostInitialize, IDS_DESC_COSTINITIALIZE, 0, ACTION_CostInitialize, NULL }, + { szCreateFolders, IDS_DESC_CREATEFOLDERS, IDS_TEMP_CREATEFOLDERS, ACTION_CreateFolders, szRemoveFolders }, + { szCreateShortcuts, IDS_DESC_CREATESHORTCUTS, IDS_TEMP_CREATESHORTCUTS, ACTION_CreateShortcuts, szRemoveShortcuts }, + { szDeleteServices, IDS_DESC_DELETESERVICES, IDS_TEMP_DELETESERVICES, ACTION_DeleteServices, szInstallServices }, + { szDisableRollback, 0, 0, ACTION_DisableRollback, NULL }, + { szDuplicateFiles, IDS_DESC_DUPLICATEFILES, IDS_TEMP_DUPLICATEFILES, ACTION_DuplicateFiles, szRemoveDuplicateFiles }, + { szExecuteAction, 0, 0, ACTION_ExecuteAction, NULL }, + { szFileCost, IDS_DESC_FILECOST, 0, ACTION_FileCost, NULL }, + { szFindRelatedProducts, IDS_DESC_FINDRELATEDPRODUCTS, IDS_TEMP_FINDRELATEDPRODUCTS, ACTION_FindRelatedProducts, NULL }, + { szForceReboot, 0, 0, ACTION_ForceReboot, NULL }, + { szInstallAdminPackage, IDS_DESC_INSTALLADMINPACKAGE, IDS_TEMP_INSTALLADMINPACKAGE, ACTION_InstallAdminPackage, NULL }, + { szInstallExecute, 0, 0, ACTION_InstallExecute, NULL }, + { szInstallExecuteAgain, 0, 0, ACTION_InstallExecute, NULL }, + { szInstallFiles, IDS_DESC_INSTALLFILES, IDS_TEMP_INSTALLFILES, ACTION_InstallFiles, szRemoveFiles }, + { szInstallFinalize, 0, 0, ACTION_InstallFinalize, NULL }, + { szInstallInitialize, 0, 0, ACTION_InstallInitialize, NULL }, + { szInstallODBC, IDS_DESC_INSTALLODBC, 0, ACTION_InstallODBC, szRemoveODBC }, + { szInstallServices, IDS_DESC_INSTALLSERVICES, IDS_TEMP_INSTALLSERVICES, ACTION_InstallServices, szDeleteServices }, + { szInstallSFPCatalogFile, IDS_DESC_INSTALLSFPCATALOGFILE, IDS_TEMP_INSTALLSFPCATALOGFILE, ACTION_InstallSFPCatalogFile, NULL }, + { szInstallValidate, IDS_DESC_INSTALLVALIDATE, 0, ACTION_InstallValidate, NULL }, + { szIsolateComponents, 0, 0, ACTION_IsolateComponents, NULL }, + { szLaunchConditions, IDS_DESC_LAUNCHCONDITIONS, 0, ACTION_LaunchConditions, NULL }, + { szMigrateFeatureStates, IDS_DESC_MIGRATEFEATURESTATES, IDS_TEMP_MIGRATEFEATURESTATES, ACTION_MigrateFeatureStates, NULL }, + { szMoveFiles, IDS_DESC_MOVEFILES, IDS_TEMP_MOVEFILES, ACTION_MoveFiles, NULL }, + { szMsiPublishAssemblies, IDS_DESC_MSIPUBLISHASSEMBLIES, IDS_TEMP_MSIPUBLISHASSEMBLIES, ACTION_MsiPublishAssemblies, szMsiUnpublishAssemblies }, + { szMsiUnpublishAssemblies, IDS_DESC_MSIUNPUBLISHASSEMBLIES, IDS_TEMP_MSIUNPUBLISHASSEMBLIES, ACTION_MsiUnpublishAssemblies, szMsiPublishAssemblies }, + { szPatchFiles, IDS_DESC_PATCHFILES, IDS_TEMP_PATCHFILES, ACTION_PatchFiles, NULL }, + { szProcessComponents, IDS_DESC_PROCESSCOMPONENTS, 0, ACTION_ProcessComponents, szProcessComponents }, + { szPublishComponents, IDS_DESC_PUBLISHCOMPONENTS, IDS_TEMP_PUBLISHCOMPONENTS, ACTION_PublishComponents, szUnpublishComponents }, + { szPublishFeatures, IDS_DESC_PUBLISHFEATURES, IDS_TEMP_PUBLISHFEATURES, ACTION_PublishFeatures, szUnpublishFeatures }, + { szPublishProduct, IDS_DESC_PUBLISHPRODUCT, 0, ACTION_PublishProduct, szUnpublishProduct }, + { szRegisterClassInfo, IDS_DESC_REGISTERCLASSINFO, IDS_TEMP_REGISTERCLASSINFO, ACTION_RegisterClassInfo, szUnregisterClassInfo }, + { szRegisterComPlus, IDS_DESC_REGISTERCOMPLUS, IDS_TEMP_REGISTERCOMPLUS, ACTION_RegisterComPlus, szUnregisterComPlus }, + { szRegisterExtensionInfo, IDS_DESC_REGISTEREXTENSIONINFO, 0, ACTION_RegisterExtensionInfo, szUnregisterExtensionInfo }, + { szRegisterFonts, IDS_DESC_REGISTERFONTS, IDS_TEMP_REGISTERFONTS, ACTION_RegisterFonts, szUnregisterFonts }, + { szRegisterMIMEInfo, IDS_DESC_REGISTERMIMEINFO, IDS_TEMP_REGISTERMIMEINFO, ACTION_RegisterMIMEInfo, szUnregisterMIMEInfo }, + { szRegisterProduct, IDS_DESC_REGISTERPRODUCT, 0, ACTION_RegisterProduct, NULL }, + { szRegisterProgIdInfo, IDS_DESC_REGISTERPROGIDINFO, IDS_TEMP_REGISTERPROGIDINFO, ACTION_RegisterProgIdInfo, szUnregisterProgIdInfo }, + { szRegisterTypeLibraries, IDS_DESC_REGISTERTYPELIBRARIES, IDS_TEMP_REGISTERTYPELIBRARIES, ACTION_RegisterTypeLibraries, szUnregisterTypeLibraries }, + { szRegisterUser, IDS_DESC_REGISTERUSER, 0, ACTION_RegisterUser, NULL }, + { szRemoveDuplicateFiles, IDS_DESC_REMOVEDUPLICATEFILES, IDS_TEMP_REMOVEDUPLICATEFILES, ACTION_RemoveDuplicateFiles, szDuplicateFiles }, + { szRemoveEnvironmentStrings, IDS_DESC_REMOVEENVIRONMENTSTRINGS, IDS_TEMP_REMOVEENVIRONMENTSTRINGS, ACTION_RemoveEnvironmentStrings, szWriteEnvironmentStrings }, + { szRemoveExistingProducts, IDS_DESC_REMOVEEXISTINGPRODUCTS, IDS_TEMP_REMOVEEXISTINGPRODUCTS, ACTION_RemoveExistingProducts, NULL }, + { szRemoveFiles, IDS_DESC_REMOVEFILES, IDS_TEMP_REMOVEFILES, ACTION_RemoveFiles, szInstallFiles }, + { szRemoveFolders, IDS_DESC_REMOVEFOLDERS, IDS_TEMP_REMOVEFOLDERS, ACTION_RemoveFolders, szCreateFolders }, + { szRemoveIniValues, IDS_DESC_REMOVEINIVALUES, IDS_TEMP_REMOVEINIVALUES, ACTION_RemoveIniValues, szWriteIniValues }, + { szRemoveODBC, IDS_DESC_REMOVEODBC, 0, ACTION_RemoveODBC, szInstallODBC }, + { szRemoveRegistryValues, IDS_DESC_REMOVEREGISTRYVALUES, IDS_TEMP_REMOVEREGISTRYVALUES, ACTION_RemoveRegistryValues, szWriteRegistryValues }, + { szRemoveShortcuts, IDS_DESC_REMOVESHORTCUTS, IDS_TEMP_REMOVESHORTCUTS, ACTION_RemoveShortcuts, szCreateShortcuts }, + { szResolveSource, 0, 0, ACTION_ResolveSource, NULL }, + { szRMCCPSearch, IDS_DESC_RMCCPSEARCH, 0, ACTION_RMCCPSearch, NULL }, + { szScheduleReboot, 0, 0, ACTION_ScheduleReboot, NULL }, + { szSelfRegModules, IDS_DESC_SELFREGMODULES, IDS_TEMP_SELFREGMODULES, ACTION_SelfRegModules, szSelfUnregModules }, + { szSelfUnregModules, IDS_DESC_SELFUNREGMODULES, IDS_TEMP_SELFUNREGMODULES, ACTION_SelfUnregModules, szSelfRegModules }, + { szSetODBCFolders, IDS_DESC_SETODBCFOLDERS, 0, ACTION_SetODBCFolders, NULL }, + { szStartServices, IDS_DESC_STARTSERVICES, IDS_TEMP_STARTSERVICES, ACTION_StartServices, szStopServices }, + { szStopServices, IDS_DESC_STOPSERVICES, IDS_TEMP_STOPSERVICES, ACTION_StopServices, szStartServices }, + { szUnpublishComponents, IDS_DESC_UNPUBLISHCOMPONENTS, IDS_TEMP_UNPUBLISHCOMPONENTS, ACTION_UnpublishComponents, szPublishComponents }, + { szUnpublishFeatures, IDS_DESC_UNPUBLISHFEATURES, IDS_TEMP_UNPUBLISHFEATURES, ACTION_UnpublishFeatures, szPublishFeatures }, + { szUnpublishProduct, IDS_DESC_UNPUBLISHPRODUCT, 0, ACTION_UnpublishProduct, NULL }, /* for rollback only */ + { szUnregisterClassInfo, IDS_DESC_UNREGISTERCLASSINFO, IDS_TEMP_UNREGISTERCLASSINFO, ACTION_UnregisterClassInfo, szRegisterClassInfo }, + { szUnregisterComPlus, IDS_DESC_UNREGISTERCOMPLUS, IDS_TEMP_UNREGISTERCOMPLUS, ACTION_UnregisterComPlus, szRegisterComPlus }, + { szUnregisterExtensionInfo, IDS_DESC_UNREGISTEREXTENSIONINFO, IDS_TEMP_UNREGISTEREXTENSIONINFO, ACTION_UnregisterExtensionInfo, szRegisterExtensionInfo }, + { szUnregisterFonts, IDS_DESC_UNREGISTERFONTS, IDS_TEMP_UNREGISTERFONTS, ACTION_UnregisterFonts, szRegisterFonts }, + { szUnregisterMIMEInfo, IDS_DESC_UNREGISTERMIMEINFO, IDS_TEMP_UNREGISTERMIMEINFO, ACTION_UnregisterMIMEInfo, szRegisterMIMEInfo }, + { szUnregisterProgIdInfo, IDS_DESC_UNREGISTERPROGIDINFO, IDS_TEMP_UNREGISTERPROGIDINFO, ACTION_UnregisterProgIdInfo, szRegisterProgIdInfo }, + { szUnregisterTypeLibraries, IDS_DESC_UNREGISTERTYPELIBRARIES, IDS_TEMP_UNREGISTERTYPELIBRARIES, ACTION_UnregisterTypeLibraries, szRegisterTypeLibraries }, + { szValidateProductID, 0, 0, ACTION_ValidateProductID, NULL }, + { szWriteEnvironmentStrings, IDS_DESC_WRITEENVIRONMENTSTRINGS, IDS_TEMP_WRITEENVIRONMENTSTRINGS, ACTION_WriteEnvironmentStrings, szRemoveEnvironmentStrings }, + { szWriteIniValues, IDS_DESC_WRITEINIVALUES, IDS_TEMP_WRITEINIVALUES, ACTION_WriteIniValues, szRemoveIniValues }, + { szWriteRegistryValues, IDS_DESC_WRITEREGISTRYVALUES, IDS_TEMP_WRITEREGISTRYVALUES, ACTION_WriteRegistryValues, szRemoveRegistryValues }, + { 0 } }; -static BOOL ACTION_HandleStandardAction( MSIPACKAGE *package, LPCWSTR action, UINT *rc ) +static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) { - BOOL ret = FALSE; + UINT rc = ERROR_FUNCTION_NOT_CALLED; UINT i; i = 0; @@ -7775,12 +7726,19 @@ static BOOL ACTION_HandleStandardAction( MSIPACKAGE *package, LPCWSTR action, UI { if (!strcmpW( StandardActions[i].action, action )) { - ui_actionstart( package, action ); + WCHAR description[100] = {0}, template[100] = {0}; + + if (StandardActions[i].description != 0) + LoadStringW(msi_hInstance, StandardActions[i].description, (LPWSTR)&description, 100); + if (StandardActions[i].template != 0) + LoadStringW(msi_hInstance, StandardActions[i].template, (LPWSTR)&template, 100); + + ui_actionstart(package, action, description, template); if (StandardActions[i].handler) { ui_actioninfo( package, action, TRUE, 0 ); - *rc = StandardActions[i].handler( package ); - ui_actioninfo( package, action, FALSE, *rc ); + rc = StandardActions[i].handler( package ); + ui_actioninfo( package, action, FALSE, !rc ); if (StandardActions[i].action_rollback && !package->need_rollback) { @@ -7791,58 +7749,46 @@ static BOOL ACTION_HandleStandardAction( MSIPACKAGE *package, LPCWSTR action, UI else { FIXME("unhandled standard action %s\n", debugstr_w(action)); - *rc = ERROR_SUCCESS; + rc = ERROR_SUCCESS; } - ret = TRUE; break; } i++; } - return ret; + return rc; } UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) { - UINT rc = ERROR_SUCCESS; - BOOL handled; + UINT rc; TRACE("Performing action (%s)\n", debugstr_w(action)); - handled = ACTION_HandleStandardAction(package, action, &rc); + rc = ACTION_HandleStandardAction(package, action); - if (!handled) - handled = ACTION_HandleCustomAction(package, action, &rc, script); + if (rc == ERROR_FUNCTION_NOT_CALLED) + rc = ACTION_HandleCustomAction(package, action, script); - if (!handled) - { + if (rc == ERROR_FUNCTION_NOT_CALLED) WARN("unhandled msi action %s\n", debugstr_w(action)); - rc = ERROR_FUNCTION_NOT_CALLED; - } return rc; } UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT script) { - UINT rc = ERROR_SUCCESS; - BOOL handled = FALSE; + UINT rc; TRACE("Performing action (%s)\n", debugstr_w(action)); package->action_progress_increment = 0; - handled = ACTION_HandleStandardAction(package, action, &rc); - - if (!handled) - handled = ACTION_HandleCustomAction(package, action, &rc, script); + rc = ACTION_HandleStandardAction(package, action); - if( !handled && ACTION_DialogBox(package, action) == ERROR_SUCCESS ) - handled = TRUE; + if (rc == ERROR_FUNCTION_NOT_CALLED) + rc = ACTION_HandleCustomAction(package, action, script); - if (!handled) - { + if (rc == ERROR_FUNCTION_NOT_CALLED) WARN("unhandled msi action %s\n", debugstr_w(action)); - rc = ERROR_FUNCTION_NOT_CALLED; - } return rc; } @@ -7903,6 +7849,42 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq) return rc; } +DWORD WINAPI dummy_thread_proc(void *arg) +{ + struct dummy_thread *info = arg; + HRESULT hr; + + hr = CoInitializeEx(0, COINIT_MULTITHREADED); + if (FAILED(hr)) ERR("CoInitializeEx failed %08x\n", hr); + + SetEvent(info->started); + WaitForSingleObject(info->stopped, INFINITE); + + CoUninitialize(); + return 0; +} + +static void start_dummy_thread(struct dummy_thread *info) +{ + if (!(info->started = CreateEventA(NULL, TRUE, FALSE, NULL))) return; + if (!(info->stopped = CreateEventA(NULL, TRUE, FALSE, NULL))) return; + if (!(info->thread = CreateThread(NULL, 0, dummy_thread_proc, info, 0, NULL))) return; + + WaitForSingleObject(info->started, INFINITE); +} + +static void stop_dummy_thread(struct dummy_thread *info) +{ + if (info->thread) + { + SetEvent(info->stopped); + WaitForSingleObject(info->thread, INFINITE); + CloseHandle(info->thread); + } + if (info->started) CloseHandle(info->started); + if (info->stopped) CloseHandle(info->stopped); +} + /**************************************************** * TOP level entry points *****************************************************/ @@ -7914,6 +7896,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; WCHAR *reinstall, *remove, *patch, *productcode; + struct dummy_thread thread_info = {NULL, NULL, NULL}; BOOL ui_exists; UINT rc; @@ -7979,6 +7962,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_adjust_privilege_properties( package ); msi_set_context( package ); + start_dummy_thread(&thread_info); + productcode = msi_dup_property( package->db, szProductCode ); if (strcmpiW( productcode, package->ProductCode )) { @@ -8027,6 +8012,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, /* finish up running custom actions */ ACTION_FinishCustomActions(package); + stop_dummy_thread(&thread_info); + if (package->need_rollback && !reinstall) { WARN("installation failed, running rollback script\n"); diff --git a/dll/win32/msi/appsearch.c b/dll/win32/msi/appsearch.c index b38bf2781f..e27fa74540 100644 --- a/dll/win32/msi/appsearch.c +++ b/dll/win32/msi/appsearch.c @@ -1104,7 +1104,7 @@ static UINT iterate_appsearch(MSIRECORD *row, LPVOID param) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, propName ); MSI_RecordSetStringW( uirow, 2, sigName ); - msi_ui_actiondata( package, szAppSearch, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); return r; diff --git a/dll/win32/msi/assembly.c b/dll/win32/msi/assembly.c index 84026c29e0..c652b3040e 100644 --- a/dll/win32/msi/assembly.c +++ b/dll/win32/msi/assembly.c @@ -698,7 +698,7 @@ UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package ) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 2, assembly->display_name ); - msi_ui_actiondata( package, szMsiPublishAssemblies, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); } return ERROR_SUCCESS; @@ -747,7 +747,7 @@ UINT ACTION_MsiUnpublishAssemblies( MSIPACKAGE *package ) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 2, assembly->display_name ); - msi_ui_actiondata( package, szMsiPublishAssemblies, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); } return ERROR_SUCCESS; diff --git a/dll/win32/msi/classes.c b/dll/win32/msi/classes.c index 1b138ebc5b..9b5794fdf3 100644 --- a/dll/win32/msi/classes.c +++ b/dll/win32/msi/classes.c @@ -893,7 +893,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) uirow = MSI_CreateRecord(1); MSI_RecordSetStringW( uirow, 1, cls->clsid ); - msi_ui_actiondata( package, szRegisterClassInfo, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release(&uirow->hdr); } RegCloseKey(hkey); @@ -985,7 +985,7 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) uirow = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( uirow, 1, cls->clsid ); - msi_ui_actiondata( package, szUnregisterClassInfo, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); } RegCloseKey( hkey ); @@ -1091,7 +1091,7 @@ UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package) uirow = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( uirow, 1, progid->ProgID ); - msi_ui_actiondata( package, szRegisterProgIdInfo, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); } return ERROR_SUCCESS; @@ -1154,7 +1154,7 @@ UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) uirow = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( uirow, 1, progid->ProgID ); - msi_ui_actiondata( package, szUnregisterProgIdInfo, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); } return ERROR_SUCCESS; @@ -1341,7 +1341,7 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) uirow = MSI_CreateRecord(1); MSI_RecordSetStringW( uirow, 1, ext->Extension ); - msi_ui_actiondata( package, szRegisterExtensionInfo, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release(&uirow->hdr); } return ERROR_SUCCESS; @@ -1424,7 +1424,7 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) uirow = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( uirow, 1, ext->Extension ); - msi_ui_actiondata( package, szUnregisterExtensionInfo, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); } return ERROR_SUCCESS; @@ -1479,7 +1479,7 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, mt->ContentType ); MSI_RecordSetStringW( uirow, 2, mt->suffix ); - msi_ui_actiondata( package, szRegisterMIMEInfo, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); } return ERROR_SUCCESS; @@ -1523,7 +1523,7 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, mime->ContentType ); MSI_RecordSetStringW( uirow, 2, mime->suffix ); - msi_ui_actiondata( package, szUnregisterMIMEInfo, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); } return ERROR_SUCCESS; diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index 565feecea6..3dffb8680a 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -1203,7 +1203,7 @@ UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action, UINT script ) row = MSI_QueryGetRecord( package->db, query, action ); if (!row) - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_FUNCTION_NOT_CALLED; type = MSI_RecordGetInteger(row,2); source = MSI_RecordGetString(row,3); diff --git a/dll/win32/msi/database.c b/dll/win32/msi/database.c index b53762e7f4..a94cebdbdf 100644 --- a/dll/win32/msi/database.c +++ b/dll/win32/msi/database.c @@ -768,8 +768,11 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) lstrcatW( path, file ); data = msi_read_text_archive( path, &len ); - if (data == NULL) - return ERROR_BAD_PATHNAME; + if (!data) + { + msi_free(path); + return ERROR_FUNCTION_FAILED; + } ptr = data; msi_parse_line( &ptr, &columns, &num_columns, &len ); @@ -1988,16 +1991,8 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); if( !db ) { - IWineMsiRemoteDatabase *remote_database; - - remote_database = (IWineMsiRemoteDatabase *)msi_get_remote( handle ); - if ( !remote_database ) - return MSIDBSTATE_ERROR; - - IWineMsiRemoteDatabase_Release( remote_database ); WARN("MsiGetDatabaseState not allowed during a custom action!\n"); - - return MSIDBSTATE_READ; + return MSIDBSTATE_ERROR; } if (db->mode != MSIDBOPEN_READONLY ) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index bed62fe5d7..8b62bb0a8f 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -34,6 +34,7 @@ typedef struct msi_control_tag msi_control; typedef UINT (*msi_handler)( msi_dialog *, msi_control *, WPARAM ); typedef void (*msi_update)( msi_dialog *, msi_control * ); typedef UINT (*control_event_handler)( msi_dialog *, const WCHAR *, const WCHAR * ); +typedef UINT (*event_handler)( msi_dialog *, const WCHAR * ); struct msi_control_tag { @@ -79,6 +80,9 @@ struct msi_dialog_tag HWND hWndFocus; LPWSTR control_default; LPWSTR control_cancel; + event_handler pending_event; + LPWSTR pending_argument; + INT retval; WCHAR name[1]; }; @@ -972,6 +976,16 @@ static UINT msi_dialog_button_handler( msi_dialog *dialog, msi_control *control, } r = MSI_IterateRecords( view, 0, msi_dialog_control_event, dialog ); msiobj_release( &view->hdr ); + + /* dialog control events must be processed last regardless of ordering */ + if (dialog->pending_event) + { + r = dialog->pending_event( dialog, dialog->pending_argument ); + + msi_free( dialog->pending_argument ); + dialog->pending_event = NULL; + dialog->pending_argument = NULL; + } return r; } @@ -3884,6 +3898,8 @@ static BOOL dialog_register_class( void ) static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_dialog *parent, control_event_handler event_handler ) { + static const WCHAR szDialogCreated[] = + {'D','i','a','l','o','g',' ','c','r','e','a','t','e','d',0}; MSIRECORD *rec = NULL; msi_dialog *dialog; @@ -3897,7 +3913,6 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di return NULL; strcpyW( dialog->name, name ); dialog->parent = parent; - msiobj_addref( &package->hdr ); dialog->package = package; dialog->event_handler = event_handler; dialog->finished = 0; @@ -3908,7 +3923,6 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di rec = msi_get_dialog_record( dialog ); if( !rec ) { - msiobj_release( &package->hdr ); msi_free( dialog ); return NULL; } @@ -3917,6 +3931,13 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di dialog->control_cancel = strdupW( MSI_RecordGetString( rec, 10 ) ); msiobj_release( &rec->hdr ); + rec = MSI_CreateRecord(2); + if (!rec) return NULL; + MSI_RecordSetStringW(rec, 1, name); + MSI_RecordSetStringW(rec, 2, szDialogCreated); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, rec); + msiobj_release(&rec->hdr); + return dialog; } @@ -4035,7 +4056,6 @@ void msi_dialog_destroy( msi_dialog *dialog ) msi_free( dialog->control_default ); msi_free( dialog->control_cancel ); - msiobj_release( &dialog->package->hdr ); dialog->package = NULL; msi_free( dialog ); } @@ -4061,109 +4081,6 @@ void msi_event_cleanup_all_subscriptions( MSIPACKAGE *package ) } } -static UINT error_dialog_handler( msi_dialog *dialog, const WCHAR *event, const WCHAR *argument ) -{ - static const WCHAR end_dialog[] = {'E','n','d','D','i','a','l','o','g',0}; - static const WCHAR error_abort[] = {'E','r','r','o','r','A','b','o','r','t',0}; - static const WCHAR error_cancel[] = {'E','r','r','o','r','C','a','n','c','e','l',0}; - static const WCHAR error_no[] = {'E','r','r','o','r','N','o',0}; - static const WCHAR result_prop[] = { - 'M','S','I','E','r','r','o','r','D','i','a','l','o','g','R','e','s','u','l','t',0 - }; - - if ( strcmpW( event, end_dialog ) ) - return ERROR_SUCCESS; - - if ( !strcmpW( argument, error_abort ) || !strcmpW( argument, error_cancel ) || - !strcmpW( argument, error_no ) ) - { - msi_set_property( dialog->package->db, result_prop, error_abort, -1 ); - } - - msi_event_cleanup_all_subscriptions( dialog->package ); - msi_dialog_end_dialog( dialog ); - - return ERROR_SUCCESS; -} - -static UINT msi_error_dialog_set_error( MSIPACKAGE *package, LPWSTR error_dialog, LPWSTR error ) -{ - MSIRECORD * row; - - static const WCHAR update[] = - {'U','P','D','A','T','E',' ','`','C','o','n','t','r','o','l','`',' ', - 'S','E','T',' ','`','T','e','x','t','`',' ','=',' ','\'','%','s','\'',' ', - 'W','H','E','R','E', ' ','`','D','i','a','l','o','g','_','`',' ','=',' ','\'','%','s','\'',' ', - 'A','N','D',' ','`','C','o','n','t','r','o','l','`',' ','=',' ', - '\'','E','r','r','o','r','T','e','x','t','\'',0}; - - row = MSI_QueryGetRecord( package->db, update, error, error_dialog ); - if (!row) - return ERROR_FUNCTION_FAILED; - - msiobj_release(&row->hdr); - return ERROR_SUCCESS; -} - -UINT msi_spawn_error_dialog( MSIPACKAGE *package, LPWSTR error_dialog, LPWSTR error ) -{ - msi_dialog *dialog; - WCHAR result[MAX_PATH]; - UINT r = ERROR_SUCCESS; - DWORD size = MAX_PATH; - int res; - - static const WCHAR pn_prop[] = {'P','r','o','d','u','c','t','N','a','m','e',0}; - static const WCHAR title_fmt[] = {'%','s',' ','W','a','r','n','i','n','g',0}; - static const WCHAR error_abort[] = {'E','r','r','o','r','A','b','o','r','t',0}; - static const WCHAR result_prop[] = { - 'M','S','I','E','r','r','o','r','D','i','a','l','o','g','R','e','s','u','l','t',0 - }; - - if ((package->ui_level & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE) return ERROR_SUCCESS; - - if ( !error_dialog ) - { - LPWSTR product_name = msi_dup_property( package->db, pn_prop ); - WCHAR title[MAX_PATH]; - - sprintfW( title, title_fmt, product_name ); - res = MessageBoxW( NULL, error, title, MB_OKCANCEL | MB_ICONWARNING ); - - msi_free( product_name ); - - if ( res == IDOK ) - return ERROR_SUCCESS; - else - return ERROR_FUNCTION_FAILED; - } - - r = msi_error_dialog_set_error( package, error_dialog, error ); - if ( r != ERROR_SUCCESS ) - return r; - - dialog = dialog_create( package, error_dialog, package->dialog, error_dialog_handler ); - if ( !dialog ) - return ERROR_FUNCTION_FAILED; - - dialog->finished = FALSE; - r = dialog_run_message_loop( dialog ); - if ( r != ERROR_SUCCESS ) - goto done; - - r = msi_get_property( package->db, result_prop, result, &size ); - if ( r != ERROR_SUCCESS) - r = ERROR_SUCCESS; - - if ( !strcmpW( result, error_abort ) ) - r = ERROR_FUNCTION_FAILED; - -done: - msi_dialog_destroy( dialog ); - - return r; -} - static void MSI_ClosePreview( MSIOBJECTHDR *arg ) { MSIPREVIEW *preview = (MSIPREVIEW *)arg; @@ -4299,8 +4216,6 @@ UINT WINAPI MsiPreviewBillboardA( MSIHANDLE hPreview, LPCSTR szControlName, LPCS return ERROR_CALL_NOT_IMPLEMENTED; } -typedef UINT (*event_handler)( msi_dialog *, const WCHAR * ); - struct control_event { const WCHAR *event; @@ -4310,10 +4225,11 @@ struct control_event static UINT dialog_event_handler( msi_dialog *, const WCHAR *, const WCHAR * ); /* create a dialog box and run it if it's modal */ -static UINT event_do_dialog( MSIPACKAGE *package, const WCHAR *name, msi_dialog *parent, BOOL destroy_modeless ) +static INT event_do_dialog( MSIPACKAGE *package, const WCHAR *name, msi_dialog *parent, BOOL destroy_modeless ) { msi_dialog *dialog; UINT r; + INT retval; /* create a new dialog */ dialog = dialog_create( package, name, parent, dialog_event_handler ); @@ -4329,12 +4245,18 @@ static UINT event_do_dialog( MSIPACKAGE *package, const WCHAR *name, msi_dialog /* modeless dialogs return an error message */ r = dialog_run_message_loop( dialog ); if (r == ERROR_SUCCESS) + { + retval = dialog->retval; msi_dialog_destroy( dialog ); + return retval; + } else + { package->dialog = dialog; + return IDOK; + } } - else r = ERROR_FUNCTION_FAILED; - return r; + else return 0; } /* end a modal dialog box */ @@ -4346,28 +4268,31 @@ static UINT event_end_dialog( msi_dialog *dialog, const WCHAR *argument ) static const WCHAR returnW[] = {'R','e','t','u','r','n',0}; if (!strcmpW( argument, exitW )) - dialog->package->CurrentInstallState = ERROR_INSTALL_USEREXIT; + dialog->retval = IDCANCEL; else if (!strcmpW( argument, retryW )) - dialog->package->CurrentInstallState = ERROR_INSTALL_SUSPEND; + dialog->retval = IDRETRY; else if (!strcmpW( argument, ignoreW )) - dialog->package->CurrentInstallState = ERROR_SUCCESS; + dialog->retval = IDOK; else if (!strcmpW( argument, returnW )) - { - msi_dialog *parent = dialog->parent; - msi_free( dialog->package->next_dialog ); - dialog->package->next_dialog = (parent) ? strdupW( parent->name ) : NULL; - dialog->package->CurrentInstallState = ERROR_SUCCESS; - } + dialog->retval = 0; else { ERR("Unknown argument string %s\n", debugstr_w(argument)); - dialog->package->CurrentInstallState = ERROR_FUNCTION_FAILED; + dialog->retval = IDABORT; } event_cleanup_subscriptions( dialog->package, dialog->name ); msi_dialog_end_dialog( dialog ); return ERROR_SUCCESS; } +static UINT pending_event_end_dialog( msi_dialog *dialog, const WCHAR *argument ) +{ + dialog->pending_event = event_end_dialog; + if (dialog->pending_argument) msi_free( dialog->pending_argument ); + dialog->pending_argument = strdupW( argument ); + return ERROR_SUCCESS; +} + /* transition from one modal dialog to another modal dialog */ static UINT event_new_dialog( msi_dialog *dialog, const WCHAR *argument ) { @@ -4378,19 +4303,39 @@ static UINT event_new_dialog( msi_dialog *dialog, const WCHAR *argument ) return ERROR_SUCCESS; } +static UINT pending_event_new_dialog( msi_dialog *dialog, const WCHAR *argument ) +{ + dialog->pending_event = event_new_dialog; + if (dialog->pending_argument) msi_free( dialog->pending_argument ); + dialog->pending_argument = strdupW( argument ); + return ERROR_SUCCESS; +} + /* create a new child dialog of an existing modal dialog */ static UINT event_spawn_dialog( msi_dialog *dialog, const WCHAR *argument ) { + INT r; /* don't destroy a modeless dialogs that might be our parent */ - event_do_dialog( dialog->package, argument, dialog, FALSE ); - if (dialog->package->CurrentInstallState != ERROR_SUCCESS) + r = event_do_dialog( dialog->package, argument, dialog, FALSE ); + if (r != 0) + { + dialog->retval = r; msi_dialog_end_dialog( dialog ); + } else msi_dialog_update_all_controls(dialog); return ERROR_SUCCESS; } +static UINT pending_event_spawn_dialog( msi_dialog *dialog, const WCHAR *argument ) +{ + dialog->pending_event = event_spawn_dialog; + if (dialog->pending_argument) msi_free( dialog->pending_argument ); + dialog->pending_argument = strdupW( argument ); + return ERROR_SUCCESS; +} + /* creates a dialog that remains up for a period of time based on a condition */ static UINT event_spawn_wait_dialog( msi_dialog *dialog, const WCHAR *argument ) { @@ -4489,26 +4434,49 @@ static UINT event_reset( msi_dialog *dialog, const WCHAR *argument ) return ERROR_SUCCESS; } -/* Return ERROR_SUCCESS if dialog is process and ERROR_FUNCTION_FAILED - * if the given parameter is not a dialog box - */ -UINT ACTION_DialogBox( MSIPACKAGE *package, const WCHAR *dialog ) +INT ACTION_ShowDialog( MSIPACKAGE *package, const WCHAR *dialog ) { - UINT r; + static const WCHAR szDialog[] = {'D','i','a','l','o','g',0}; + MSIRECORD *row; + INT rc; + + if (!TABLE_Exists(package->db, szDialog)) return 0; + + row = MSI_CreateRecord(0); + if (!row) return -1; + MSI_RecordSetStringW(row, 0, dialog); + rc = MSI_ProcessMessage(package, INSTALLMESSAGE_SHOWDIALOG, row); + msiobj_release(&row->hdr); + + if (rc == -2) rc = 0; + + if (!rc) + { + MSIRECORD *row = MSI_CreateRecord(2); + if (!row) return -1; + MSI_RecordSetInteger(row, 1, 2726); + MSI_RecordSetStringW(row, 2, dialog); + MSI_ProcessMessage(package, INSTALLMESSAGE_INFO, row); + + msiobj_release(&row->hdr); + } + return rc; +} + +INT ACTION_DialogBox( MSIPACKAGE *package, const WCHAR *dialog ) +{ + INT r; if (package->next_dialog) ERR("Already got next dialog... ignoring it\n"); package->next_dialog = NULL; - /* Dialogs are chained by filling in the next_dialog member - * of the package structure, then terminating the current dialog. - * The code below sees the next_dialog member set, and runs the - * next dialog. - * We fall out of the loop below if we come across a modeless - * dialog, as it returns ERROR_IO_PENDING when we try to run - * its message loop. + /* Dialogs are chained through NewDialog, which sets the next_dialog member. + * We fall out of the loop if we reach a modeless dialog, which immediately + * returns IDOK, or an EndDialog event, which returns the value corresponding + * to its argument. */ r = event_do_dialog( package, dialog, NULL, TRUE ); - while (r == ERROR_SUCCESS && package->next_dialog) + while (package->next_dialog) { WCHAR *name = package->next_dialog; @@ -4516,7 +4484,6 @@ UINT ACTION_DialogBox( MSIPACKAGE *package, const WCHAR *dialog ) r = event_do_dialog( package, name, NULL, TRUE ); msi_free( name ); } - if (r == ERROR_IO_PENDING) r = ERROR_SUCCESS; return r; } @@ -4567,9 +4534,9 @@ static const WCHAR validate_product_idW[] = {'V','a','l','i','d','a','t','e','P' static const struct control_event control_events[] = { - { end_dialogW, event_end_dialog }, - { new_dialogW, event_new_dialog }, - { spawn_dialogW, event_spawn_dialog }, + { end_dialogW, pending_event_end_dialog }, + { new_dialogW, pending_event_new_dialog }, + { spawn_dialogW, pending_event_spawn_dialog }, { spawn_wait_dialogW, event_spawn_wait_dialog }, { do_actionW, event_do_action }, { add_localW, event_add_local }, diff --git a/dll/win32/msi/files.c b/dll/win32/msi/files.c index 981d568bd8..635bff6198 100644 --- a/dll/win32/msi/files.c +++ b/dll/win32/msi/files.c @@ -44,7 +44,7 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac MSI_RecordSetStringW( uirow, 1, f->FileName ); MSI_RecordSetStringW( uirow, 9, f->Component->Directory ); MSI_RecordSetInteger( uirow, 6, f->FileSize ); - msi_ui_actiondata( package, action, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_ui_progress( package, 2, f->FileSize, 0, 0 ); } @@ -966,7 +966,7 @@ done: MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString(rec, 1) ); MSI_RecordSetInteger( uirow, 6, 1 ); /* FIXME */ MSI_RecordSetStringW( uirow, 9, destdir ); - msi_ui_actiondata( package, szMoveFiles, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free(sourcedir); @@ -1103,7 +1103,7 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString( row, 1 ) ); MSI_RecordSetInteger( uirow, 6, file->FileSize ); MSI_RecordSetStringW( uirow, 9, MSI_RecordGetString( row, 5 ) ); - msi_ui_actiondata( package, szDuplicateFiles, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free(dest); @@ -1179,7 +1179,7 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param ) uirow = MSI_CreateRecord( 9 ); MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString( row, 1 ) ); MSI_RecordSetStringW( uirow, 9, MSI_RecordGetString( row, 5 ) ); - msi_ui_actiondata( package, szRemoveDuplicateFiles, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free(dest); @@ -1301,7 +1301,7 @@ done: uirow = MSI_CreateRecord( 9 ); MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString(row, 1) ); MSI_RecordSetStringW( uirow, 9, dir ); - msi_ui_actiondata( package, szRemoveFiles, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free(filename); @@ -1391,7 +1391,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) uirow = MSI_CreateRecord( 9 ); MSI_RecordSetStringW( uirow, 1, file->FileName ); MSI_RecordSetStringW( uirow, 9, comp->Directory ); - msi_ui_actiondata( package, szRemoveFiles, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); } diff --git a/dll/win32/msi/font.c b/dll/win32/msi/font.c index 999f884b28..8a91ecab94 100644 --- a/dll/win32/msi/font.c +++ b/dll/win32/msi/font.c @@ -272,7 +272,7 @@ static UINT ITERATE_RegisterFonts(MSIRECORD *row, LPVOID param) if (p) p++; else p = uipath; MSI_RecordSetStringW( uirow, 1, p ); - msi_ui_actiondata( package, szRegisterFonts, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free( uipath ); /* FIXME: call msi_ui_progress? */ @@ -352,7 +352,7 @@ static UINT ITERATE_UnregisterFonts( MSIRECORD *row, LPVOID param ) if (p) p++; else p = uipath; MSI_RecordSetStringW( uirow, 1, p ); - msi_ui_actiondata( package, szUnregisterFonts, uirow ); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); msi_free( uipath ); /* FIXME: call msi_ui_progress? */ diff --git a/dll/win32/msi/format.c b/dll/win32/msi/format.c index 142f356155..10baa0ef04 100644 --- a/dll/win32/msi/format.c +++ b/dll/win32/msi/format.c @@ -260,7 +260,7 @@ static WCHAR *deformat_environment( FORMAT *format, FORMSTR *str, int *ret_len ) } static WCHAR *deformat_literal( FORMAT *format, FORMSTR *str, BOOL *propfound, - BOOL *nonprop, int *type, int *len ) + int *type, int *len ) { LPCWSTR data = get_formstr_data(format, str); WCHAR *replaced = NULL; @@ -327,58 +327,24 @@ static LPWSTR build_default_format(const MSIRECORD* record) { int i; int count; - LPWSTR rc, buf; - static const WCHAR fmt[] = {'%','i',':',' ','%','s',' ',0}; - static const WCHAR fmt_null[] = {'%','i',':',' ',' ',0}; - static const WCHAR fmt_index[] = {'%','i',0}; - LPCWSTR str; - WCHAR index[10]; - DWORD size, max_len, len; + WCHAR *rc, buf[26]; + static const WCHAR fmt[] = {'%','i',':',' ','[','%','i',']',' ',0}; + DWORD size; count = MSI_RecordGetFieldCount(record); - max_len = MAX_PATH; - buf = msi_alloc((max_len + 1) * sizeof(WCHAR)); - - rc = NULL; + rc = msi_alloc(1); + rc[0] = 0; size = 1; + for (i = 1; i <= count; i++) { - sprintfW(index, fmt_index, i); - str = MSI_RecordGetString(record, i); - len = (str) ? lstrlenW(str) : 0; - len += (sizeof(fmt_null)/sizeof(fmt_null[0]) - 3) + lstrlenW(index); - size += len; - - if (len > max_len) - { - max_len = len; - buf = msi_realloc(buf, (max_len + 1) * sizeof(WCHAR)); - if (!buf) - { - msi_free(rc); - return NULL; - } - } - - if (str) - sprintfW(buf, fmt, i, str); - else - sprintfW(buf, fmt_null, i); - - if (!rc) - { - rc = msi_alloc(size * sizeof(WCHAR)); - lstrcpyW(rc, buf); - } - else - { - rc = msi_realloc(rc, size * sizeof(WCHAR)); - lstrcatW(rc, buf); - } + sprintfW(buf, fmt, i, i); + size += lstrlenW(buf); + rc = msi_realloc(rc, size * sizeof(WCHAR)); + lstrcatW(rc, buf); } - msi_free(buf); return rc; } @@ -669,7 +635,7 @@ static WCHAR *replace_stack_prop( FORMAT *format, STACK *values, content->len = *oldsize - 2; content->type = *type; - if (*type == FORMAT_NUMBER) + if (*type == FORMAT_NUMBER && format->record) { replaced = deformat_index( format, content, len ); if (replaced) @@ -683,7 +649,7 @@ static WCHAR *replace_stack_prop( FORMAT *format, STACK *values, } else if (format->package) { - replaced = deformat_literal( format, content, propfound, nonprop, type, len ); + replaced = deformat_literal( format, content, propfound, type, len ); } else { @@ -775,7 +741,7 @@ static BOOL verify_format(LPWSTR data) static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data, DWORD *len, - MSIRECORD* record, INT* failcount) + MSIRECORD* record) { FORMAT format; FORMSTR *str = NULL; @@ -858,18 +824,37 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, LPDWORD size ) { - WCHAR *format, *deformated; + WCHAR *format, *deformated = NULL; UINT rc = ERROR_INVALID_PARAMETER; DWORD len; + MSIRECORD *record_deformated; + int field_count, i; TRACE("%p %p %p %p\n", package, record, buffer, size); + dump_record(record); if (!(format = msi_dup_record_field( record, 0 ))) format = build_default_format( record ); - TRACE("%s\n", debugstr_w(format)); + field_count = MSI_RecordGetFieldCount(record); + record_deformated = MSI_CloneRecord(record); + if (!record_deformated) + { + rc = ERROR_OUTOFMEMORY; + goto end; + } + MSI_RecordSetStringW(record_deformated, 0, format); + for (i = 1; i <= field_count; i++) + { + if (MSI_RecordGetString(record, i)) + { + deformat_string_internal(package, MSI_RecordGetString(record, i), &deformated, &len, NULL); + MSI_RecordSetStringW(record_deformated, i, deformated); + msi_free(deformated); + } + } - deformat_string_internal( package, format, &deformated, &len, record, NULL ); + deformat_string_internal(package, format, &deformated, &len, record_deformated); if (buffer) { if (*size>len) @@ -891,6 +876,8 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, else rc = ERROR_SUCCESS; *size = len; + msiobj_release(&record_deformated->hdr); +end: msi_free( format ); msi_free( deformated ); return rc; diff --git a/dll/win32/msi/lang/msi_Bg.rc b/dll/win32/msi/lang/msi_Bg.rc index e5d5df7c00..46ab527b80 100644 --- a/dll/win32/msi/lang/msi_Bg.rc +++ b/dll/win32/msi/lang/msi_Bg.rc @@ -18,21 +18,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -#pragma code_page(65001) +STRINGTABLE +{ + 4 "The specified installation package could not be opened. Please check the file path and try again." + 5 "ïúòÿò %s íå å íàìåðåí" + 9 "ïîñòàâåòå äèñê %s" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a [...] + 11 "âúâåäåòå ïàïêàòà, êîÿòî ñúäúðæà %s" + 12 "èçòî÷íèêà çà èíñòàëàöèÿ íà ôóíêöèîíàëíîñòòà ëèïñâà" + 13 "ìðåæîâîòî óñòðîéñòâà íóæíî çà ôóíêöèîíàëíîñòòà ëèïñâà " + 14 "ôóíêöèîíàëíîñò îò:" + 15 "èçáåðåòå ïàïêàòà, êîÿòî ñúäúðæà %s" +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." - 5 "ïúòÿò %s íå å íàìåðåí" - 9 "ïîñòàâåòå äèñê %s" - 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a pa [...] - 11 "âúâåäåòå ïàïêàòà, êîÿòî ñúäúðæà %s" - 12 "èçòî÷íèêà çà èíñòàëàöèÿ íà ôóíêöèîíàëíîñòòà ëèïñâà" - 13 "ìðåæîâîòî óñòðîéñòâà íóæíî çà ôóíêöèîíàëíîñòòà ëèïñâà " - 14 "ôóíêöèîíàëíîñò îò:" - 15 "èçáåðåòå ïàïêàòà, êîÿòî ñúäúðæà %s" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_Da.rc b/dll/win32/msi/lang/msi_Da.rc index fc37ff0bb9..b14bd9f285 100644 --- a/dll/win32/msi/lang/msi_Da.rc +++ b/dll/win32/msi/lang/msi_Da.rc @@ -18,21 +18,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT -#pragma code_page(65001) +STRINGTABLE +{ + 4 "Kunne ikke åbne den specificerede installationspakke. Kontroller stien og prøv igen." + 5 "kunne ikke finden stien '%s'." + 9 "indsæt disk '%s'" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a [...] + 11 "angiv kataloget som indeholder '%s'." + 12 "featurens installationskilde mangler." + 13 "featurens netværksdrev mangler." + 14 "feature fra:" + 15 "Vælg kataloget som indeholder '%s'." +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "Kunne ikke åbne den specificerede installationspakke. Kontroller stien og prøv igen." - 5 "kunne ikke finden stien '%s'." - 9 "indsæt disk '%s'" - 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a pa [...] - 11 "angiv kataloget som indeholder '%s'." - 12 "featurens installationskilde mangler." - 13 "featurens netværksdrev mangler." - 14 "feature fra:" - 15 "Vælg kataloget som indeholder '%s'." + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_De.rc b/dll/win32/msi/lang/msi_De.rc index 558107c57f..0d486f3f87 100644 --- a/dll/win32/msi/lang/msi_De.rc +++ b/dll/win32/msi/lang/msi_De.rc @@ -19,21 +19,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -#pragma code_page(65001) +STRINGTABLE +{ + 4 "Das angegebene Installationspaket konnte nicht geöffnet werden. Bitte überprüfen Sie den Pfadnamen und versuchen Sie es noch einmal." + 5 "Der Pfad %s wurde nicht gefunden." + 9 "Bitte Disk %s einlegen." + 10 "Windows Installer %s\n\nBenutzung:\nmsiexec Befehl {Parameter} [Zusätzliche Parammeter]\n\nProdukt installieren:\n\t/i {Paket|Produktcode} [Eigenschaft]\n\t/package {Paket|Produktcode} [Eigenschaft]\n\t/a Paket [Eigenschaft]\nInstallation reparieren:\n\t/f[p|o|e|d|c|a|u|m|s|v] {Paket|Produktcode}\nProdukt deinstallieren:\n\t/uninstall {Paket|Produktcode} [Eigenschaft]\n\t/x {Paket|Produktcode} [Eigenschaft]\nProdukt ankündigen:\n\t/j[u|m] Paket [/t Transformationspaket] [/g Sprac [...] + 11 "Geben Sie das Verzeichnis ein, dass %s enthält." + 12 "Die Installationsquelle für das Feature fehlt." + 13 "Das Netzwerklaufwerk für das Feature fehlt." + 14 "Feature von:" + 15 "Wählen Sie das Verzeichnis aus, dass %s enthält." +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "Das angegebene Installationspaket konnte nicht geöffnet werden. Bitte überprüfen Sie den Pfadnamen und versuchen Sie es noch einmal." - 5 "Der Pfad %s wurde nicht gefunden." - 9 "Bitte Disk %s einlegen." - 10 "Windows Installer %s\n\nBenutzung:\nmsiexec Befehl {Parameter} [Zusätzliche Parammeter]\n\nProdukt installieren:\n\t/i {Paket|Produktcode} [Eigenschaft]\n\t/package {Paket|Produktcode} [Eigenschaft]\n\t/a Paket [Eigenschaft]\nInstallation reparieren:\n\t/f[p|o|e|d|c|a|u|m|s|v] {Paket|Produktcode}\nProdukt deinstallieren:\n\t/uninstall {Paket|Produktcode} [Eigenschaft]\n\t/x {Paket|Produktcode} [Eigenschaft]\nProdukt ankündigen:\n\t/j[u|m] Paket [/t Transformationspaket] [/g Sprachke [...] - 11 "Geben Sie das Verzeichnis ein, dass %s enthält." - 12 "Die Installationsquelle für das Feature fehlt." - 13 "Das Netzwerklaufwerk für das Feature fehlt." - 14 "Feature von:" - 15 "Wählen Sie das Verzeichnis aus, dass %s enthält." + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_En.rc b/dll/win32/msi/lang/msi_En.rc index 2b520e98d1..d7972f7409 100644 --- a/dll/win32/msi/lang/msi_En.rc +++ b/dll/win32/msi/lang/msi_En.rc @@ -19,21 +19,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -#pragma code_page(65001) +STRINGTABLE +{ + 4 "The specified installation package could not be opened. Please check the file path and try again." + 5 "path %s not found" + 9 "insert disk %s" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a [...] + 11 "enter which folder contains %s" + 12 "install source for feature missing" + 13 "network drive for feature missing" + 14 "feature from:" + 15 "choose which folder contains %s" +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." - 5 "path %s not found" - 9 "insert disk %s" - 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a pat [...] - 11 "enter which folder contains %s" - 12 "install source for feature missing" - 13 "network drive for feature missing" - 14 "feature from:" - 15 "choose which folder contains %s" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_Es.rc b/dll/win32/msi/lang/msi_Es.rc index f81e26096a..c9b3392b4c 100644 --- a/dll/win32/msi/lang/msi_Es.rc +++ b/dll/win32/msi/lang/msi_Es.rc @@ -18,21 +18,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -#pragma code_page(65001) +STRINGTABLE +{ + 4 "No se ha podido abrir el paquete de instalación especificado. Por favor, compruebe la ruta del archivo y vuelva a intentarlo." + 5 "ruta %s no encontrada" + 9 "inserte el disco %s" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a [...] + 11 "introduzca qué carpeta contiene %s" + 12 "instalar fuente para característica ausente" + 13 "unidad de red para característica ausente" + 14 "característica de:" + 15 "elija qué carpeta contiene %s" +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "No se ha podido abrir el paquete de instalación especificado. Por favor, compruebe la ruta del archivo y vuelva a intentarlo." - 5 "ruta %s no encontrada" - 9 "inserte el disco %s" - 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a pa [...] - 11 "introduzca qué carpeta contiene %s" - 12 "instalar fuente para característica ausente" - 13 "unidad de red para característica ausente" - 14 "característica de:" - 15 "elija qué carpeta contiene %s" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_Fi.rc b/dll/win32/msi/lang/msi_Fi.rc index 4229e2dc9c..233aa2c3ae 100644 --- a/dll/win32/msi/lang/msi_Fi.rc +++ b/dll/win32/msi/lang/msi_Fi.rc @@ -18,21 +18,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT -#pragma code_page(65001) +STRINGTABLE +{ + 4 "Annettua asennuspakettia ei voitu avata. Tarkista tiedoston polku ja yritä uudelleen." + 5 "Polkua %s ei löydy." + 9 "Anna levy %s" + 10 "Windows Installer %s\n\nKäyttö:\nmsiexec komento {pakollinen parametri} [valinnainen parametri]\n\nAsenna tuote:\n\t/i {paketti|tuotekoodi} [ominaisuus]\n\t/package {paketti|tuotekoodi} [ominaisuus]\n\t/a {paketti} [ominaisuus]\nKorjaa asennus:\n\t/f[p|o|e|d|c|a|u|m|s|v] {paketti|tuotekoodi}\nPoista tuote:\n\t/uninstall {paketti|tuotekoodi} [ominaisuus]\n\t/x {paketti|tuotekoodi} [ominaisuus]\nMainosta (advertise) tuotetta:\n\t/j[u|m] paketti [/t muunnos] [/g kielitunnus]\nAsenna [...] + 11 "Anna kansio, jossa on %s" + 12 "Ominaisuuden asennuslähde puuttuu." + 13 "Ominaisuuden verkkolevy puuttuu." + 14 "Ominaisuus:" + 15 "Valitse kansio, jossa on %s" +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "Annettua asennuspakettia ei voitu avata. Tarkista tiedoston polku ja yritä uudelleen." - 5 "Polkua %s ei löydy." - 9 "Anna levy %s" - 10 "Windows Installer %s\n\nKäyttö:\nmsiexec komento {pakollinen parametri} [valinnainen parametri]\n\nAsenna tuote:\n\t/i {paketti|tuotekoodi} [ominaisuus]\n\t/package {paketti|tuotekoodi} [ominaisuus]\n\t/a {paketti} [ominaisuus]\nKorjaa asennus:\n\t/f[p|o|e|d|c|a|u|m|s|v] {paketti|tuotekoodi}\nPoista tuote:\n\t/uninstall {paketti|tuotekoodi} [ominaisuus]\n\t/x {paketti|tuotekoodi} [ominaisuus]\nMainosta (advertise) tuotetta:\n\t/j[u|m] paketti [/t muunnos] [/g kielitunnus]\nAsenna ko [...] - 11 "Anna kansio, jossa on %s" - 12 "Ominaisuuden asennuslähde puuttuu." - 13 "Ominaisuuden verkkolevy puuttuu." - 14 "Ominaisuus:" - 15 "Valitse kansio, jossa on %s" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_Fr.rc b/dll/win32/msi/lang/msi_Fr.rc index ca1f4d6d3e..026baa11ea 100644 --- a/dll/win32/msi/lang/msi_Fr.rc +++ b/dll/win32/msi/lang/msi_Fr.rc @@ -19,22 +19,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -/* UTF-8 */ -#pragma code_page(65001) +STRINGTABLE +{ + 4 "Le paquet d'installation spécifié n'a pu être ouvert. Veuillez vérifier le chemin du fichier et réessayer." + 5 "Le chemin %s est introuvable" + 9 "insérez le disque %s" + 10 "Programme d'installation Windows %s\n\nUsage :\nmsiexec commande {paramètre obligatoire} [paramètre optionnel]\n\nInstaller un produit :\n\t/i {paquet|code_produit} [propriété]\n\t/package {paquet|code_produit} [propriété]\n\t/a paquet [propriété]\nRéparer une installation :\n\t/f[p|o|e|d|c|a|u|m|s|v] {paquet|code_produit}\nDésinstaller un produit :\n\t/uninstall {paquet|code_produit} [propriété]\n\t/x {paquet|code_produit} [propriété]\nPublier un produit :\n\t/j[u|m] paquet [/t [...] + 11 "saisissez le nom du dossier contenant %s" + 12 "source d'installation pour la fonctionnalité manquante" + 13 "lecteur réseau pour la fonctionnalité manquante" + 14 "fonctionnalité depuis :" + 15 "sélectionnez le dossier contenant %s" +} -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "Le paquet d'installation spécifié n'a pu être ouvert. Veuillez vérifier le chemin du fichier et réessayer." - 5 "Le chemin %s est introuvable" - 9 "insérez le disque %s" - 10 "Programme d'installation Windows %s\n\nUsage :\nmsiexec commande {paramètre obligatoire} [paramètre optionnel]\n\nInstaller un produit :\n\t/i {paquet|code_produit} [propriété]\n\t/package {paquet|code_produit} [propriété]\n\t/a paquet [propriété]\nRéparer une installation :\n\t/f[p|o|e|d|c|a|u|m|s|v] {paquet|code_produit}\nDésinstaller un produit :\n\t/uninstall {paquet|code_produit} [propriété]\n\t/x {paquet|code_produit} [propriété]\nPublier un produit :\n\t/j[u|m] paquet [/t tra [...] - 11 "saisissez le nom du dossier contenant %s" - 12 "source d'installation pour la fonctionnalité manquante" - 13 "lecteur réseau pour la fonctionnalité manquante" - 14 "fonctionnalité depuis :" - 15 "sélectionnez le dossier contenant %s" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_He.rc b/dll/win32/msi/lang/msi_He.rc index be903327c2..492e2aae4c 100644 --- a/dll/win32/msi/lang/msi_He.rc +++ b/dll/win32/msi/lang/msi_He.rc @@ -21,21 +21,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -#pragma code_page(65001) +STRINGTABLE +{ + 4 "The specified installation package could not be opened. Please check the file path and try again." + 5 "הנתיב %s לא נמצא" + 9 "הכנס דיסק %s" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a [...] + 11 "הזן איזו תיקיה מכילה את %s" + 12 "מקור ההתקנה עבור התכונה חסר" + 13 "כונן רשת עבור התכונה חסר" + 14 "מהתקן מ:" + 15 "בחר איזו תיקיה מכילה את %s" +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." - 5 "הנתיב %s לא נמצא" - 9 "הכנס דיסק %s" - 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a pat [...] - 11 "הזן איזו תיקיה מכילה את %s" - 12 "מקור ההתקנה עבור התכונה חסר" - 13 "כונן רשת עבור התכונה חסר" - 14 "מהתקן מ:" - 15 "בחר איזו תיקיה מכילה את %s" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_Hu.rc b/dll/win32/msi/lang/msi_Hu.rc index 4354013251..70ab46f9d9 100644 --- a/dll/win32/msi/lang/msi_Hu.rc +++ b/dll/win32/msi/lang/msi_Hu.rc @@ -18,21 +18,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -#pragma code_page(65001) +STRINGTABLE +{ + 4 "The specified installation package could not be opened. Please check the file path and try again." + 5 "%s útvonal nem található" + 9 "helyezze be a lemezt: %s" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a [...] + 11 "adja meg melyik mappa tartalmazza ezt: %s" + 12 "hiányzó tulajdonság a telepítési forráshoz" + 13 "hiányzó tulajdonság a hálózati meghajtóhoz" + 14 "tulajdonság innen:" + 15 "válassza ki, melyik mappa tartalmazza ezt: %s" +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." - 5 "%s útvonal nem található" - 9 "helyezze be a lemezt: %s" - 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a pa [...] - 11 "adja meg melyik mappa tartalmazza ezt: %s" - 12 "hiányzó tulajdonság a telepítési forráshoz" - 13 "hiányzó tulajdonság a hálózati meghajtóhoz" - 14 "tulajdonság innen:" - 15 "válassza ki, melyik mappa tartalmazza ezt: %s" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_It.rc b/dll/win32/msi/lang/msi_It.rc index bc1ad8470e..4a437a8ab2 100644 --- a/dll/win32/msi/lang/msi_It.rc +++ b/dll/win32/msi/lang/msi_It.rc @@ -18,22 +18,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -/*UTF-8*/ -#pragma code_page(65001) +STRINGTABLE +{ + 4 "Impossibile aprire il pacchetto di installazione specificato. Per favore controlla l'indirizzo del file e riprova." + 5 "percorso %s non trovato" + 9 "inserire disco %s" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a [...] + 11 "immettere il nome della cartella che contiene %s" + 12 "sorgente di installazione per la funzionalità mancante" + 13 "periferica di rete per la funzionalità mancante" + 14 "funzionalità da:" + 15 "selezionare la cartella che contiene %s" +} -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "Impossibile aprire il pacchetto di installazione specificato. Per favore controlla l'indirizzo del file e riprova." - 5 "percorso %s non trovato" - 9 "inserire disco %s" - 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a pa [...] - 11 "immettere il nome della cartella che contiene %s" - 12 "sorgente di installazione per la funzionalità mancante" - 13 "periferica di rete per la funzionalità mancante" - 14 "funzionalità da:" - 15 "selezionare la cartella che contiene %s" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_Ja.rc b/dll/win32/msi/lang/msi_Ja.rc index c0759563e8..c3ac0197d5 100644 --- a/dll/win32/msi/lang/msi_Ja.rc +++ b/dll/win32/msi/lang/msi_Ja.rc @@ -1,15 +1,157 @@ LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL -#pragma code_page(65001) +STRINGTABLE +{ + 5 "パス %s がみつかりませんでした" + 9 "ディスク %s を挿入してください" + 10 "無効なパラメータです" + 11 "%s のあるフォルダを入力してください" + 12 "機能のインストール元がありません" + 13 "機能があるネットワークドライブがありません" + 14 "機能の場所:" + 15 "%s のあるフォルダを選択してください" +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 5 "パス %s がみつかりませんでした" - 9 "ディスク %s を挿入してください" - 10 "無効なパラメータです" - 11 "%s のあるフォルダを入力してください" - 12 "機能\のインストール元がありません" - 13 "機能\があるネットワークドライブがありません" - 14 "機能\の場所:" - 15 "%s のあるフォルダを選択してください" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_Ko.rc b/dll/win32/msi/lang/msi_Ko.rc index fc72a65ee5..47d29b9202 100644 --- a/dll/win32/msi/lang/msi_Ko.rc +++ b/dll/win32/msi/lang/msi_Ko.rc @@ -20,21 +20,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -#pragma code_page(65001) +STRINGTABLE +{ + 4 " 지정한 설치 패키지를 열 수 없습니다. 파일 경로를 확인하고 다시 시도하십시오." + 5 "%s 경로를 찾을수 없습니다" + 9 "디스크 %s 삽입" + 10 "Windows Installer %s\n\n사용법:\nmsiexec 명령 {필수 매개변수} [선택적 매개변수]\n\n제품 설치:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\n설치 복구:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n제품 제거:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\n제품 알리기:\n\t/j[u|m] package [/t transform] [/g languageid]\n패치 추가:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\n위의 명령어를 위한 L [...] + 11 "%s를 포함하는 폴더를 입력하세여" + 12 "빠진 부분(feature)을 위한 설치 원본" + 13 "빠진 부분(feature)을 위한 네트워크 드라이브" + 14 "부분(feature)에서:" + 15 " %s를 포함하는 폴더 선택" +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 " 지정한 설치 패키지를 열 수 없습니다. 파일 경로를 확인하고 다시 시도하십시오." - 5 "%s 경로를 찾을수 없습니다" - 9 "디스크 %s 삽입" - 10 "Windows Installer %s\n\n사용법:\nmsiexec 명령 {필수 매개변수} [선택적 매개변수]\n\n제품 설치:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\n설치 복구:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n제품 제거:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\n제품 알리기:\n\t/j[u|m] package [/t transform] [/g languageid]\n패치 추가:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [property]\n위의 명령어를 위한 Log [...] - 11 "%s를 포함하는 폴더를 입력하세여" - 12 "빠진 부분(feature)을 위한 설치 원본" - 13 "빠진 부분(feature)을 위한 네트워크 드라이브" - 14 "부분(feature)에서:" - 15 " %s를 포함하는 폴더 선택" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_Lt.rc b/dll/win32/msi/lang/msi_Lt.rc index 57de188ed6..597b360ab2 100644 --- a/dll/win32/msi/lang/msi_Lt.rc +++ b/dll/win32/msi/lang/msi_Lt.rc @@ -18,22 +18,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL -/* UTF-8 */ -#pragma code_page(65001) +STRINGTABLE +{ + 4 "Nepavyko atverti nurodyto diegimo paketo. Patikrinkite failo kelią ir mėginkite dar kartą." + 5 "kelias %s nerastas" + 9 "įdėkite diską %s" + 10 "Windows diegimo programa %s\n\nNaudojimas:\nmsiexec komanda {būtinas parametras} [nebūtinas parametras]\n\nĮdiegti produktą:\n\t/i {paketas|produkto_kodas} [savybė]\n\t/package {paketas|produkto_kodas} [savybė]\n\t/a paketas [savybė]\nTaisyti įdiegimą:\n\t/f[p|o|e|d|c|a|u|m|s|v] {paketas|produkto_kodas}\nPašalinti produktą:\n\t/uninstall {paketas|produkto_kodas} [savybė]\n\t/x {paketas|produkto_kodas} [savybė]\nSkelbti produktą:\n\t/j[u|m] paketas [/t pakeitimas] [/g kalbos_ident [...] + 11 "įveskite aplanką, kuris turi %s" + 12 "trūksta diegimo šaltinio komponentui" + 13 "trūksta tinklo disko komponentui" + 14 "komponentas iš:" + 15 "parinkite aplanką, kuris turi %s" +} -LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "Nepavyko atverti nurodyto diegimo paketo. Patikrinkite failo kelią ir mėginkite dar kartą." - 5 "kelias %s nerastas" - 9 "įdėkite diską %s" - 10 "Windows diegimo programa %s\n\nNaudojimas:\nmsiexec komanda {būtinas parametras} [nebūtinas parametras]\n\nĮdiegti produktą:\n\t/i {paketas|produkto_kodas} [savybė]\n\t/package {paketas|produkto_kodas} [savybė]\n\t/a paketas [savybė]\nTaisyti įdiegimą:\n\t/f[p|o|e|d|c|a|u|m|s|v] {paketas|produkto_kodas}\nPašalinti produktą:\n\t/uninstall {paketas|produkto_kodas} [savybė]\n\t/x {paketas|produkto_kodas} [savybė]\nSkelbti produktą:\n\t/j[u|m] paketas [/t pakeitimas] [/g kalbos_identifi [...] - 11 "įveskite aplanką, kuris turi %s" - 12 "trūksta diegimo šaltinio komponentui" - 13 "trūksta tinklo disko komponentui" - 14 "komponentas iš:" - 15 "parinkite aplanką, kuris turi %s" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_Nl.rc b/dll/win32/msi/lang/msi_Nl.rc index 4157d4a41f..29197e8916 100644 --- a/dll/win32/msi/lang/msi_Nl.rc +++ b/dll/win32/msi/lang/msi_Nl.rc @@ -18,21 +18,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL -#pragma code_page(65001) +STRINGTABLE +{ + 4 "Het opgegeven installatie pakket kon niet worden geopend. Verifieer het bestandspad en probeer opnieuw." + 5 "Pad %s niet gevonden" + 9 "Plaats disk %s" + 10 "Windows Installer %s\n\nGebruik:\nmsiexec commando {vereiste parameter} [optionele parameter]\n\nInstalleer een product:\n\t/i {pakket|productcode} [eigenschap]\n\t/package {pakket|productcode} [eigenschap]\n\t/a pakket [eigenschap]\nHerstel een installatie:\n\t/f[p|o|e|d|c|a|u|m|s|v] {pakket|productcode}\nVerwijder een product:\n\t/uninstall {pakket|productcode} [eigenschap]\n\t/x {pakket|productcode} [eigenschap]\nAdverteer een product:\n\t/j[u|m] pakket [/t transform] [/g lang [...] + 11 "Voer de map in die %s bevat" + 12 "De installatiebron van de feature ontbreekt" + 13 "De netwerkschijf met de feature ontbreekt" + 14 "Feature van:" + 15 "Kies de map die %s bevat" +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "Het opgegeven installatie pakket kon niet worden geopend. Verifieer het bestandspad en probeer opnieuw." - 5 "Pad %s niet gevonden" - 9 "Plaats disk %s" - 10 "Windows Installer %s\n\nGebruik:\nmsiexec commando {vereiste parameter} [optionele parameter]\n\nInstalleer een product:\n\t/i {pakket|productcode} [eigenschap]\n\t/package {pakket|productcode} [eigenschap]\n\t/a pakket [eigenschap]\nHerstel een installatie:\n\t/f[p|o|e|d|c|a|u|m|s|v] {pakket|productcode}\nVerwijder een product:\n\t/uninstall {pakket|productcode} [eigenschap]\n\t/x {pakket|productcode} [eigenschap]\nAdverteer een product:\n\t/j[u|m] pakket [/t transform] [/g languag [...] - 11 "Voer de map in die %s bevat" - 12 "De installatiebron van de feature ontbreekt" - 13 "De netwerkschijf met de feature ontbreekt" - 14 "Feature van:" - 15 "Kies de map die %s bevat" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_No.rc b/dll/win32/msi/lang/msi_No.rc index 733525dba6..8c020bfe61 100644 --- a/dll/win32/msi/lang/msi_No.rc +++ b/dll/win32/msi/lang/msi_No.rc @@ -18,21 +18,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -#pragma code_page(65001) +STRINGTABLE +{ + 4 "Klarte ikke åpne den oppgitte installasjonspakken. Kontroller filbanen og prøv igjen." + 5 "Fant ikke stien '%s'." + 9 "Sett i disk '%s'" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a [...] + 11 "Oppgi katalogen som inneholder '%s'." + 12 "Egenskapens installasjonskilde mangler." + 13 "Egenskapens nettverksstasjon mangler." + 14 "Egenskap fra::" + 15 "Velg katalogen som inneholder '%s'." +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "Klarte ikke åpne den oppgitte installasjonspakken. Kontroller filbanen og prøv igjen." - 5 "Fant ikke stien '%s'." - 9 "Sett i disk '%s'" - 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a pa [...] - 11 "Oppgi katalogen som inneholder '%s'." - 12 "Egenskapens installasjonskilde mangler." - 13 "Egenskapens nettverksstasjon mangler." - 14 "Egenskap fra::" - 15 "Velg katalogen som inneholder '%s'." + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_Pl.rc b/dll/win32/msi/lang/msi_Pl.rc index 2f43e6c682..5bbf4b07c3 100644 --- a/dll/win32/msi/lang/msi_Pl.rc +++ b/dll/win32/msi/lang/msi_Pl.rc @@ -19,21 +19,161 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" - LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -#pragma code_page(65001) +STRINGTABLE +{ + 4 "Nie udało się otworzyć wybranego pakietu instalacyjnego. Sprawdź czy ścieżka jest poprawna i spróbuj ponownie." + 5 "ścieżka '%s' nie została odnaleziona" + 9 "włóż dysk '%s'" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a [...] + 11 "wprowadź siceżkę do folderu zawierającego '%s'" + 12 "źródło danych zawierające żądanę funkcję jest niedostępne" + 13 "dysk siecowy zawierający żądaną funckje jest niedostępny" + 14 "funkcja z:" + 15 "wybierz folder zawierający '%s'" +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "Nie udało się otworzyć wybranego pakietu instalacyjnego. Sprawdź czy ścieżka jest poprawna i spróbuj ponownie." - 5 "ścieżka '%s' nie została odnaleziona" - 9 "włóż dysk '%s'" - 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a pa [...] - 11 "wprowadź siceżkę do folderu zawierającego '%s'" - 12 "źródło danych zawierające żądanę funkcję jest niedostępne" - 13 "dysk siecowy zawierający żądaną funckje jest niedostępny" - 14 "funkcja z:" - 15 "wybierz folder zawierający '%s'" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } diff --git a/dll/win32/msi/lang/msi_Pt.rc b/dll/win32/msi/lang/msi_Pt.rc index 22147b87e6..1d919c993b 100644 --- a/dll/win32/msi/lang/msi_Pt.rc +++ b/dll/win32/msi/lang/msi_Pt.rc @@ -20,36 +20,320 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -#pragma code_page(65001) +STRINGTABLE +{ + 4 "O pacote de instalação especificado não pôde ser aberto. Por favor, verifique o arquivo e tente novamente." + 5 "caminho %s não encontrado" + 9 "insira disco %s" + 10 "Windows Installer %s\n\nModo de usar:\nmsiexec command {required parameter} [optional parammeter]\n\nInstalar um produto:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nReparar uma instalação:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nDesinstalar um produto:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAnunciar um produto:\n\t/j[u|m] package [/t transform] [/g language [...] + 11 "entre a pasta que contém %s" + 12 "faltando fonte de instalação para característica" + 13 "faltando drive de rede para característica" + 14 "origem da característica:" + 15 "escolha a pasta que contém %s" +} -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} +/* Standard action template strings */ STRINGTABLE { - 4 "O pacote de instalação especificado não pôde ser aberto. Por favor, verifique o arquivo e tente novamente." - 5 "caminho %s não encontrado" - 9 "insira disco %s" - 10 "Windows Installer %s\n\nModo de usar:\nmsiexec command {required parameter} [optional parammeter]\n\nInstalar um produto:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nReparar uma instalação:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nDesinstalar um produto:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAnunciar um produto:\n\t/j[u|m] package [/t transform] [/g languageid] [...] - 11 "entre a pasta que contém %s" - 12 "faltando fonte de instalação para característica" - 13 "faltando drive de rede para característica" - 14 "origem da característica:" - 15 "escolha a pasta que contém %s" + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" + IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" + IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_REGISTERFONTS "Font: [1]" + IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]" + IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]" + IDS_TEMP_REMOVEFOLDERS "Folder: [1]" + IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]" + IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]" + IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]" + IDS_TEMP_STARTSERVICES "Service: [1]" + IDS_TEMP_STOPSERVICES "Service: [1]" + IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]" + IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]" + IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}" + IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]" + IDS_TEMP_UNREGISTERFONTS "Font: [1]" + IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]" + IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]" + IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]" + IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]" + IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]" + IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]" } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." - 5 "localização %s não encontrada" - 9 "insira o disco %s" - 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a pa [...] - 11 "indique que pasta contém %s" - 12 "instalar fonte para a opção em falta" - 13 "controlador de rede para a opção em falta" - 14 "opção de:" - 15 "indique que pasta contém %s" + 4 "The specified installation package could not be opened. Please check the file path and try again." + 5 "localização %s não encontrada" + 9 "insira o disco %s" + 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a [...] + 11 "indique que pasta contém %s" + 12 "instalar fonte para a opção em falta" + 13 "controlador de rede para a opção em falta" + 14 "opção de:" + 15 "indique que pasta contém %s" +} + +/* Error messages */ +STRINGTABLE +{ + IDS_FATALEXIT "{{Fatal error: }}" + IDS_ERROR "{{Error [1]. }}" + IDS_WARNING "Warning [1]." + IDS_INFO "Info [1]." + IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}" + IDS_OUTOFDISKSPACE "{{Disk full: }}" + IDS_ACTIONSTART "Action [Time]: [1]. [2]" + IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}" + IDS_INFO_ACTIONSTART "Action start [Time]: [1]." + IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]." + IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ===" + + IDS_ERR_INSERTDISK "Please insert the disk: [2]" + IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it." +} + +/* Standard action description strings */ +STRINGTABLE +{ + IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space" + IDS_DESC_APPSEARCH "Searching for installed applications" + IDS_DESC_BINDIMAGE "Binding executables" + IDS_DESC_CCPSEARCH "Searching for qualifying products" + IDS_DESC_COSTFINALIZE "Computing space requirements" + IDS_DESC_COSTINITIALIZE "Computing space requirements" + IDS_DESC_CREATEFOLDERS "Creating folders" + IDS_DESC_CREATESHORTCUTS "Creating shortcuts" + IDS_DESC_DELETESERVICES "Deleting services" + IDS_DESC_DUPLICATEFILES "Creating duplicate files" + IDS_DESC_FILECOST "Computing space requirements" + IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications" + IDS_DESC_INSTALLADMINPACKAGE "Copying network install files" + IDS_DESC_INSTALLFILES "Copying new files" + IDS_DESC_INSTALLODBC "Installing ODBC components" + IDS_DESC_INSTALLSERVICES "Installing new services" + IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog" + IDS_DESC_INSTALLVALIDATE "Validating install" + IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions" + IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications" + IDS_DESC_MOVEFILES "Moving files" + IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information" + IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information" + IDS_DESC_PATCHFILES "Patching files" + IDS_DESC_PROCESSCOMPONENTS "Updating component registration" + IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components" + IDS_DESC_PUBLISHFEATURES "Publishing Product Features" + IDS_DESC_PUBLISHPRODUCT "Publishing product information" + IDS_DESC_REGISTERCLASSINFO "Registering Class servers" + IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components" + IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers" + IDS_DESC_REGISTERFONTS "Registering fonts" + IDS_DESC_REGISTERMIMEINFO "Registering MIME info" + IDS_DESC_REGISTERPRODUCT "Registering product" + IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers" + IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries" + IDS_DESC_REGISTERUSER "Registering user" + IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files" + IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications" + IDS_DESC_REMOVEFILES "Removing files" + IDS_DESC_REMOVEFOLDERS "Removing folders" + IDS_DESC_REMOVEINIVALUES "Removing INI files entries" + IDS_DESC_REMOVEODBC "Removing ODBC components" + IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values" + IDS_DESC_REMOVESHORTCUTS "Removing shortcuts" + IDS_DESC_RMCCPSEARCH "Searching for qualifying products" + IDS_DESC_SELFREGMODULES "Registering modules" + IDS_DESC_SELFUNREGMODULES "Unregistering modules" + IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories" + IDS_DESC_STARTSERVICES "Starting services" + IDS_DESC_STOPSERVICES "Stopping services" + IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components" + IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features" + IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information" + IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers" + IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components" + IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers" + IDS_DESC_UNREGISTERFONTS "Unregistering fonts" + IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info" + IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers" + IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries" + IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings" + IDS_DESC_WRITEINIVALUES "Writing INI files values" + IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values" +} + +/* Standard action template strings */ +STRINGTABLE +{ + IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]" + IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]" + IDS_TEMP_BINDIMAGE "File: [1]" + IDS_TEMP_CREATEFOLDERS "Folder: [1]" + IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]" + IDS_TEMP_DELETESERVICES "Service: [1]" + IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]" + IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_INSTALLSERVICES "Service: [2]" + IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]" + IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]" + IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]" + IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]" + IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]" + IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]" + IDS_TEMP_PUBLISHFEATURES "Feature: [1]" ... 3293 lines suppressed ...

1 0

[reactos] 01/03: [PSDK] Update msi.h. CORE-13762
by Amine Khaldi 08 Oct '17

08 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=154006810e4a1b014550a… commit 154006810e4a1b014550a0b35b02bb1fabb88242 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 8 09:10:16 2017 +0100 [PSDK] Update msi.h. CORE-13762 --- sdk/include/psdk/msi.h | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/sdk/include/psdk/msi.h b/sdk/include/psdk/msi.h index 58a1eb2c5e..84386c5ec4 100644 --- a/sdk/include/psdk/msi.h +++ b/sdk/include/psdk/msi.h @@ -105,7 +105,10 @@ typedef enum tagINSTALLMESSAGE INSTALLMESSAGE_COMMONDATA = 0x0b000000, INSTALLMESSAGE_INITIALIZE = 0x0c000000, INSTALLMESSAGE_TERMINATE = 0x0d000000, - INSTALLMESSAGE_SHOWDIALOG = 0x0e000000 + INSTALLMESSAGE_SHOWDIALOG = 0x0e000000, + INSTALLMESSAGE_RMFILESINUSE = 0x19000000, + INSTALLMESSAGE_INSTALLSTART = 0x1A000000, + INSTALLMESSAGE_INSTALLEND = 0x1B000000, } INSTALLMESSAGE; typedef enum tagREINSTALLMODE @@ -130,18 +133,22 @@ typedef enum tagINSTALLLOGMODE INSTALLLOGMODE_WARNING = (1 << (INSTALLMESSAGE_WARNING >> 24)), INSTALLLOGMODE_USER = (1 << (INSTALLMESSAGE_USER >> 24)), INSTALLLOGMODE_INFO = (1 << (INSTALLMESSAGE_INFO >> 24)), + INSTALLLOGMODE_FILESINUSE = (1 << (INSTALLMESSAGE_FILESINUSE >> 24)), INSTALLLOGMODE_RESOLVESOURCE = (1 << (INSTALLMESSAGE_RESOLVESOURCE >> 24)), INSTALLLOGMODE_OUTOFDISKSPACE = (1 << (INSTALLMESSAGE_OUTOFDISKSPACE >> 24)), INSTALLLOGMODE_ACTIONSTART = (1 << (INSTALLMESSAGE_ACTIONSTART >> 24)), INSTALLLOGMODE_ACTIONDATA = (1 << (INSTALLMESSAGE_ACTIONDATA >> 24)), - INSTALLLOGMODE_COMMONDATA = (1 << (INSTALLMESSAGE_COMMONDATA >> 24)), - INSTALLLOGMODE_PROPERTYDUMP = (1 << (INSTALLMESSAGE_PROGRESS >> 24)), - INSTALLLOGMODE_VERBOSE = (1 << (INSTALLMESSAGE_INITIALIZE >> 24)), - INSTALLLOGMODE_EXTRADEBUG = (1 << (INSTALLMESSAGE_TERMINATE >> 24)), INSTALLLOGMODE_PROGRESS = (1 << (INSTALLMESSAGE_PROGRESS >> 24)), + INSTALLLOGMODE_PROPERTYDUMP = (1 << (INSTALLMESSAGE_PROGRESS >> 24)), + INSTALLLOGMODE_COMMONDATA = (1 << (INSTALLMESSAGE_COMMONDATA >> 24)), INSTALLLOGMODE_INITIALIZE = (1 << (INSTALLMESSAGE_INITIALIZE >> 24)), + INSTALLLOGMODE_VERBOSE = (1 << (INSTALLMESSAGE_INITIALIZE >> 24)), INSTALLLOGMODE_TERMINATE = (1 << (INSTALLMESSAGE_TERMINATE >> 24)), - INSTALLLOGMODE_SHOWDIALOG = (1 << (INSTALLMESSAGE_SHOWDIALOG >> 24)) + INSTALLLOGMODE_EXTRADEBUG = (1 << (INSTALLMESSAGE_TERMINATE >> 24)), + INSTALLLOGMODE_SHOWDIALOG = (1 << (INSTALLMESSAGE_SHOWDIALOG >> 24)), + INSTALLLOGMODE_RMFILESINUSE = (1 << (INSTALLMESSAGE_RMFILESINUSE >> 24)), + INSTALLLOGMODE_INSTALLSTART = (1 << (INSTALLMESSAGE_INSTALLSTART >> 24)), + INSTALLLOGMODE_INSTALLEND = (1 << (INSTALLMESSAGE_INSTALLEND >> 24)), } INSTALLLOGMODE; typedef enum tagINSTALLLOGATTRIBUTES

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